remove some unecessary code