Removing some unecessary code