changed json name and removed some unused code