Took out some commented code