First round of removing console and a few log formatting enhancements