thread per query resolve #12 resolve #36

+clear unsused classes