Json CPP library update, classifier cleanup