delete unused class
start refactoring JSON