#bug 17389 - some cleanup