clean up and link updates