cleaned up some unneccessary code