Modify analysis with new, modified cleaning functionals