Clean out in the Graphics Aisle

Pm sent on #10