Remove willPrepareForDraw support