Removing some normal code