remove query-dependent ...