General clean-up and link verification