Remove some unnecessary references