remove commented out code and config