First whack at post-transition cleanup.