Cleanup and adding links