Took out some unnecessary code