nuke much code, simplify output