Refactor Services Plans actor.

[Finishes #76804582]