remove some confused code that dates from when we had