We should treat it like the other cases and just remove listening point, and dependent JAIN entities.