bug 1028718 - more cleanup