cleaned up unneeded code