Simplify QueryEngine API

Forgot to remove...