Remove comments in template [MJ-356]