Default query initialization changed to new, so we can delete some code here. Original Pull Request: #156