clean-up stuff

Not so many comment tags