Remove cruft
Match original output more closely.