Remove some old vestiges