Cleanup of links, etc.