Cleanup Linker / Optimizer

Right, indeed.