Clean up
Add triads