cleaning up queries
fix merge conflict with myself. dumb.