Removed unused code and unit tests (some to be moved to printer class specific unit tests)