Revamped clear/arc/stroke. Removed circle.