Took out unneeded code