post-expansion cleanup