removed unnecessary classes, starting to re-add JSONUtil.