+ Move unlink into StorageManager