diff --git a/src/linkahead/common/models.py b/src/linkahead/common/models.py
index 0cc0f11e037a2be97c58c2d6a4a44c9f201c05fd..a8144286fdacefacadf2b823160e0eb9bfe00c77 100644
--- a/src/linkahead/common/models.py
+++ b/src/linkahead/common/models.py
@@ -2279,12 +2279,12 @@ class File(Record):
         server's "caosroot" file system.
     @param file: A local path or python file object.  The file designated by
         this argument will be uploaded to the server via HTTP.
-    @param pickup: Deprecated: A file/folder in the DropOffBox (the server will move that
+    @param pickup: A file/folder in the DropOffBox (the server will move that
         file into its "caosroot" file system).
     @param thumbnail: (Local) filename to a thumbnail for this file.
     @param properties: A list of properties for this file record. @todo is this
         implemented?
-    @param from_location: Deprecated x 2, use `pickup` instead.
+    @param from_location: Deprecated, use `pickup` instead.
 
     """
 
@@ -2311,12 +2311,10 @@ class File(Record):
         self.thumbnail = thumbnail
 
         self.pickup = pickup
-        if self.pickup is not None:
-            warn(DeprecationWarning("The DropOffBox is deprecated, do not use `pickup`."))
 
         if from_location is not None:
             warn(DeprecationWarning(
-                "Param `from_location` is deprecated, as everything DropOffBox related."))
+                "Param `from_location` is deprecated, use `pickup instead`."))
 
         if self.pickup is None:
             self.pickup = from_location