ModernFactory cleanup