remove commented out text and extra spaces