cleanup & rename partials