Remove comments as they break the flow