removed enterprise-specific logic