Remove deactivated code