Move queries to service admin clean