Removed draw from painting methods.

Draw has to be explicitely called.