Remove lots of templated comments