Remove other unnecessary jsonnode conversions