Removed cruft from early attempt at implementing new output format