refactored actor shutdown