Fix a compilation error and remove some old stuff