Remove some unecessary code