Fixed CleanupData to prevent recursive delete of all data