Fixed AbstractDrawHelper, removed unused