Remove superfluous drawing class