I think this should not be removed in this PR since it relates to /state endpoint. It should be removed when /state endpoint is removed.