storage/sqlite/queries: cleanup