Revert "Partial for delete links, refactorisation"

This reverts commit d4b530a04c01d41990ddb1f2aacaaa435f3f1201.
Corrections on last refactorisation