Remove some more unused code