Remove deactivate functions