Remove some old stuff