(refactor) Remove dummy links