Get rid of commented out code