diff --git a/proto/current.proto b/proto/current.proto
index e463922..560c122 100644
--- a/proto/current.proto
+++ b/proto/current.proto
@@ -4,14 +4,16 @@ package weather;
 
 option go_package = "codeberg.org/andcscott/OpenWeatherMap-gRPC-API/proto";
 
-import "location_types.proto";
+//import "location_types.proto";
+//import "units.proto"
 
 message RequestCurrent {
   //LocationType location_type = 1; NOT IMPLEMENTED YET
+  //Units units = 2; NOT IMPLEMENTED YET
   string city = 1;
   // optional string zip_code = 2; NOT IMPLEMENTED YET
-  optional string state = 2; // US Only
-  optional string country = 3; // Must be ISO 3166 country code
+  // optional string state = 2; // US Only / NOT IMPLEMENTED YET
+  // optional string country = 3; // Must be an ISO 3166 code / NOT IMPLEMENTED YET
 }
 
 message SendCurrent {
diff --git a/proto/extended.proto b/proto/extended.proto
index 5a88143..1005d2a 100644
--- a/proto/extended.proto
+++ b/proto/extended.proto
@@ -4,14 +4,17 @@ package weather;
 
 option go_package = "codeberg.org/andcscott/OpenWeatherMap-gRPC-API/proto";
 
-import "location_types.proto";
+//import "location_types.proto";
+//import "units.proto"
 
 message RequestExtended {
-  LocationType location_type = 1;
-  string location = 2; // zip/postal code, city name, or comma separated coords "-81.2,40.5" 
-  optional string state = 3; // US Only
-  optional string country = 4; // Must be ISO 3166 country code
-  uint32 days = 5;
+  //LocationType location_type = 1; NOT IMPLEMENTED YET
+  //Units units = 2; NOT IMPLEMENTED YET
+  string city = 1;
+  // optional string zip_code = 2; NOT IMPLEMENTED YET
+  // optional string state = 2; // US Only / NOT IMPLEMENTED YET
+  // optional string country = 3; // Must be ISO 3166 code / NOT IMPLEMENTED YET
+  uint32 days = 2;
 }
 
 message SendExtended {
diff --git a/proto/location_types.proto b/proto/location_types.proto
index edd9f1a..a558257 100644
--- a/proto/location_types.proto
+++ b/proto/location_types.proto
@@ -9,11 +9,7 @@ enum LocationType {
   LOCATION_CITY = 1;
   LOCATION_ZIP = 2;
   LOCATION_COORDS = 3;
-  /*
-   * NOT YET IMPLEMENTED
-   *
   LOCATION_CITY_STATE = 4;
   LOCATION_CITY_COUNTRY = 5;
   LOCATION_ZIP_COUNTRY = 6;
-  */
 }