Remove Links, simplify