trying to remove unneeded link calls