Have removed non-used functionality from the FsmConverter file and moved the remaining uses to now use the extension methods version to make it more succinct and easier to use. Have also tidied up a few of the references in files along the way where they have not been needed.