diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc
index eb9f540b23dfaa8b68a7ceddf9cc41b2e1aa9269..93acba906b8fa153a1894beece1092f246dba884 100644
--- a/src/uas/UAS.cc
+++ b/src/uas/UAS.cc
@@ -7,7 +7,9 @@
  *
  ****************************************************************************/
 
-// THIS CLASS IS DEPRECATED. ALL NEW FUNCTIONALITY SHOULD GO INTO Vehicle class
+// NO NEW CODE HERE
+// UASInterface, UAS.h/cc are deprecated. All new functionality should go into Vehicle.h/cc
+//
 
 #include <QList>
 #include <QTimer>
diff --git a/src/uas/UAS.h b/src/uas/UAS.h
index 4dad4d5fda8c5c9052b553db57801099c0955e16..06ec98a62a2689651d076b96c58fa9ea67600183 100644
--- a/src/uas/UAS.h
+++ b/src/uas/UAS.h
@@ -7,14 +7,9 @@
  *
  ****************************************************************************/
 
-
-/**
- * @file
- *   @brief Definition of Unmanned Aerial Vehicle object
- *
- *   @author Lorenz Meier <mavteam@student.ethz.ch>
- *
- */
+// NO NEW CODE HERE
+// UASInterface, UAS.h/cc are deprecated. All new functionality should go into Vehicle.h/cc
+//
 
 #ifndef _UAS_H_
 #define _UAS_H_
diff --git a/src/uas/UASInterface.h b/src/uas/UASInterface.h
index a9dfb79f0060292ee58ca0d0a3ec7a76c18af54b..0bed211c82b86fcf3517c4e070eba11ae38e06fd 100644
--- a/src/uas/UASInterface.h
+++ b/src/uas/UASInterface.h
@@ -7,14 +7,9 @@
  *
  ****************************************************************************/
 
-
-/**
- * @file
- *   @brief Abstract interface, represents one unmanned aerial vehicle
- *
- *   @author Lorenz Meier <mavteam@student.ethz.ch>
- *
- */
+// NO NEW CODE HERE
+// UASInterface, UAS.h/cc are deprecated. All new functionality should go into Vehicle.h/cc
+//
 
 #ifndef _UASINTERFACE_H_
 #define _UASINTERFACE_H_