Get rid of Sugar
Fix up errors, clean things up
Rip out remaining Sugar references
Cleanup