refactor(query): remove all query calls