Remove usage of willPrepareForDraw