Remove query.py
Add h_combine aggregate function