mako: Cleanup