Pruning back on query expression java objects, removed unused default constructors and setters