Remove willPrepareForDraw usage