Cleaning syntax, remove old links