cleaning up queries. targets' CRUD done