#77 - Cleanup