Cleanup of GetEntityState