Remove more unused code.