     /**
      *  @private
      */
-    private static const CONTROLS_PROPERTY_FLAG:uint = 1 << 0;
+    private static const CONTROLBAR_PROPERTY_FLAG:uint = 1 << 0;
 
     /**
      *  @private


    /**
     *  @private
     *  Several properties are proxied to controlGroup.  However, when controlGroup
     *  is not around, we need to store values set on SkinnableContainer.  This object 
     *  stores those values.  If controlGroup is around, the values are stored 
     *  on the controlGroup directly.  However, we need to know what values 
     *  have been set by the developer on the SkinnableContainer (versus set on 
     *  the controlGroup or defaults of the controlGroup) as those are values 
     *  we want to carry around if the controlGroup changes (via a new skin). 
     *  In order to store this info effeciently, controlGroupProperties becomes 
     *  a uint to store a series of BitFlags.  These bits represent whether a 
     *  property has been explicitely set on this SkinnableContainer.  When the 
     *  controlGroup is not around, controlGroupProperties is a typeless 
     *  object to store these proxied properties.  When controlGroup is around,
     *  controlGroupProperties stores booleans as to whether these properties 
     *  have been explicitely set or not.
     */
    private var controlGroupProperties:Object = {};

    //----------------------------------
    //  controlGroup
    //---------------------------------- 
    
    [SkinPart(required="false")]

    {
        super.partRemoved(partName, instance);

        if (instance == controlBarGroup)
        {
            // copy proxied values from contentGroup (if explicitely set) to contentGroupProperties
            
            var newControlBarGroupProperties:Object = {};
            
            if (BitFlagUtil.isSet(controlBarGroupProperties as uint, CONTROLBAR_PROPERTY_FLAG))
                newControlBarGroupProperties.controlBarContent = controlBarGroup.getMXMLContent();
            
            if (BitFlagUtil.isSet(controlBarGroupProperties as uint, LAYOUT_PROPERTY_FLAG))
                newControlBarGroupProperties.layout = controlBarGroup.layout;
            
            controlBarGroupProperties = newControlBarGroupProperties;

            controlBarGroup.mxmlContent = null;
            controlBarGroup.layout = null;
        }
    }

