Get rid of unecessary code