Finalized XFSM actor controller, cleanup XHTN