Cleaning up more unused code