remove use of SAFIR_RUNTIME in sate