removing some unecessary code