removed some unecessary code