Got rid of commented out code