- remove some unneeded UnitOfWorkScopes