Link options cleanups