Split cleanup to it's own cd block