*8521* Remove unnecessary references