minor cleanup, RT#15017