Remove more unused things.