Remove debug output and add TODOs for print layout