Unbreak Mac build
Remove various unused things