start on query cleanup