FIX: entity deallocation