epsilon: further cleanup after completing a query
3 files changed