remove some not quite correct stuff