RoF + UF ornamentation clean-up