UF-97 cleanup