-WARNS6 cleanup