Remove some old stuff after stealing the good bits