Removed some commands that ran every time but shouldnt have