refactoring in progress - cleanup of EntityQuery.using