More actor clean-up