Get rid of more unused code.