refactor (remove double relayState