Removing dispose from painting

Correct location is during painting.
Merge branch 'dispose' into dispose_text