cleanup, allow to do direct queries without saving stuff