Remove unneeded references