remove some unneeded references