remove some more misc unnecessary references