removed unused code, make full cover coverage for query builder, ref #90