Deactivation cleanup