Simplify and remove some old stuff