Let's have a unified way of freeing the FSM instance once it was allocated, otherwise it's far more difficult to understand and maintain. Change-Id: I8883e737fa112cff57834abae7ef272388a54edb