took out some unneeded code