Tidy up - remove possibly unneeded interface OutputHandler