Added back unlink mechanism