Moved Activation/Deactivation flush