big changes to querier, cleanups, removed manager class (redundant)