cleanup core for new linking methods