Remove now-unused code.