AM: rm commented tags
AM: comment possibly unused message tags

It is possible that with different build flags some of the tags are
actually used. But there is no simple way to trace those.