refactored actors removal