Removes a call to `confirm_query()` (deprecated), and minor formatting
Removes some unused utility functions, and minor formatting