Add methods to avoid problems when deleting.
Make sure that the link id is the correct one.
Merge branch 'remove_registry' into stable/havana