Remove obsolete output, add some debug info