830: remove some references