remove unused code from legacy class OutputMaker
remove or move legacy code