cleanup, RT#27958
cleanup, RT#27958