Safer cleanup of UMAData