Cleanup comments in templates. MJ-52