*8521* Removing unnecessary references