Removing unneeded references