Clean unecessary code