move deactivate logic