Improve elinksopt, remove redundant elinksearch