cleaned up unecessary code