Cleanup. Get rid of more unused stuff.