Took out unnecessary code