Remove unused debug logging, clean up log output