BZ-1105174: moving cleanup to UF instead to force users do it on their apps