2.0.0-pre18 -- ensure that cleanup happens in all cases