oops, remove some unused code