Removing class-global (static) members - Phase I