Removed unused ScopeFactory