further clean-up in Skilled/OperatorRouter/Managed