Remove more unused junk.