Removed unused data from data.json
Added more locations for data.json.locations