Got rid of a bunch of commented code