remove all the support stuff (bug 865044)