Fix/remove some more links