Fix removing comments and compile tempaltes again