removed superflous _from state