cleanup for bug 21898