Fix demos to user Printer class; Delete headers from demos