Removing uncecessary code