Mako cleanup