Rationalize the link configuration. #23