Added deactivate to States