removed some unnecessary references