FIX: Better unlinking