housecleaning, remove commented out code and typo