post-upgrade cleanup