Updated manual deactivation