Remove more unused stuff.