remove old query code
fix for issue #15