Add cleanup to catalog.