Removes some old, unneeded logic.