cleanup, RT#27958