Switch to NJSON
Do not use JSONParser
Cleanup