Remove comments
Fix the configuration of generators