cleanup in HavaloEntity