cleaning up unneeded code