Got rid of commented out crap