Small code cleanup. Removal of json module