Moved shape drawing code from painter/painter.py to painter/shapepainter.py
Removed crud
Removed crud