Remove another link leftover, move some code