remove unneeded links and some dead code