Remove comments after mappings