Correct mako templates
Remove useless comments