cleanup and partials