Wip 15757 refactor actorsystem termination √

Good point, thanks