Removed unnecessary fields from Location