Slutters/persosim/remove obsolete method calls from state machine