Removed all location code
Now pulling data from API site