Automatic folder clean up with Catalog.