Removing more legacy code.