Removing unnecessary references