Minor improvement to Atlas cleanup.