change language, remove commented out code