Small links clean-up