Bug 920642: Remove dead files from bug 870171. r=rnewman