remove cruft from Query
more cleanup
Merge branch 'master' of github.com:350dotorg/akcrm