Better orchestration of control activating/removal