Improve logging, reduce verbosity
Improve logging
logging
Improve logging, clean up dead code