diff --git a/libraries/AP_Proximity/AP_Proximity.cpp b/libraries/AP_Proximity/AP_Proximity.cpp
index 1015b6aeb1..a0fa739ac5 100644
--- a/libraries/AP_Proximity/AP_Proximity.cpp
+++ b/libraries/AP_Proximity/AP_Proximity.cpp
@@ -185,7 +185,7 @@ void AP_Proximity::init()
             drivers[instance] = new AP_Proximity_AirSimSITL(*this, state[instance], params[instance]);
             break;
 #endif
-        } // switch (get_type(instance))
+        }
 
         if (drivers[instance] != nullptr) {
             // we loaded a driver for this instance, so it must be
@@ -310,7 +310,7 @@ bool AP_Proximity::get_object_angle_and_distance(uint8_t object_number, float& a
     return boundary.get_horizontal_object_angle_and_distance(object_number, angle_deg, distance);
 }
 
-// handle mavlink DISTANCE_SENSOR messages
+// handle mavlink messages
 void AP_Proximity::handle_msg(const mavlink_message_t &msg)
 {
     for (uint8_t i=0; i<num_instances; i++) {
diff --git a/libraries/AP_Proximity/AP_Proximity.h b/libraries/AP_Proximity/AP_Proximity.h
index a857618754..15ef34a787 100644
--- a/libraries/AP_Proximity/AP_Proximity.h
+++ b/libraries/AP_Proximity/AP_Proximity.h
@@ -116,7 +116,7 @@ public:
     // mavlink related methods
     //
 
-    // handle mavlink DISTANCE_SENSOR messages
+    // handle mavlink messages
     void handle_msg(const mavlink_message_t &msg);
 
     // methods for mavlink SYS_STATUS message (send_sys_status)
diff --git a/libraries/AP_Proximity/AP_Proximity_Backend.h b/libraries/AP_Proximity/AP_Proximity_Backend.h
index 27d5208cd4..8bd2e784b1 100644
--- a/libraries/AP_Proximity/AP_Proximity_Backend.h
+++ b/libraries/AP_Proximity/AP_Proximity_Backend.h
@@ -42,7 +42,7 @@ public:
     // get distance upwards in meters. returns true on success
     virtual bool get_upward_distance(float &distance) const { return false; }
 
-    // handle mavlink DISTANCE_SENSOR messages
+    // handle mavlink messages
     virtual void handle_msg(const mavlink_message_t &msg) {}
 
     // store rangefinder values