Printers cleanup, part1
printers cleanup - part2
code cleanup