more cleanup

refer to bug 21898