A little more cleanup. Comment out json output.