Took out some unneeded code