Design System - Cleanup by Taylor Wells