removing unecessary code