remove query related stuff