StateMachineFacts class clean-up