Fix some more, remove some old