cleanups from checkout stability