Deactivation completely works now