output/debug cleanup