Remove a few more unused things.