more cleanup, RT#10992