Refactor tag usage

[mbercx]

We're adding quite a bit of tags to the various steps of the outline. Useful, but we don't want too much noise. Good to look into which tags really serve a purpose, and which should be removed/refactored.