oops, remove some old stuff