refactoring, removed json-simple