State Machine Signalling Clean Up