Fix/longevity entity cleanup