I find it more brittle to duplicate the cleanup code.