more cleanup link fixing