State Machine: clean-up