Cleanup of enterprise version