remove some annoying references