Remove debug printing
Switch from built-in query+conf to command line setup.