remove some crufty code