Make .cleanup non-optional