cleaning up disabled / enabled state