clean up
workaround issue 671 (link updates)