diff --git a/src/org/thoughtcrime/securesms/database/MediaDatabase.java b/src/org/thoughtcrime/securesms/database/MediaDatabase.java
index 53d41a866..8ad9136c1 100644
--- a/src/org/thoughtcrime/securesms/database/MediaDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/MediaDatabase.java
@@ -31,8 +31,8 @@ public class MediaDatabase extends Database {
     }
 
     public static MediaRecord from(@NonNull Context context, @NonNull Cursor cursor) {
-      AttachmentDatabase       attachmentDatabase = DatabaseFactory.getAttachmentDatabase(context);
-      List<DatabaseAttachment> attachments        = attachmentDatabase.getAttachment(cursor);
+      //AttachmentDatabase       attachmentDatabase = DatabaseFactory.getAttachmentDatabase(context);
+      List<DatabaseAttachment> attachments        = null;//attachmentDatabase.getAttachment(cursor);
       String                   serializedAddress  = null;//cursor.getString(cursor.getColumnIndexOrThrow(MmsDatabase.ADDRESS));
       boolean                  outgoing           = false; //MessagingDatabase.Types.isOutgoingMessageType(cursor.getLong(cursor.getColumnIndexOrThrow(MmsDatabase.MESSAGE_BOX)));
       Address                  address            = null;
diff --git a/src/org/thoughtcrime/securesms/database/model/DisplayRecord.java b/src/org/thoughtcrime/securesms/database/model/DisplayRecord.java
index 7204da394..1519f5bb2 100644
--- a/src/org/thoughtcrime/securesms/database/model/DisplayRecord.java
+++ b/src/org/thoughtcrime/securesms/database/model/DisplayRecord.java
@@ -84,10 +84,6 @@ public abstract class DisplayRecord {
     return recipient;
   }
 
-  public long getDateSent() {
-    return dateSent;
-  }
-
   public long getDateReceived() {
     return dateReceived;
   }
@@ -96,46 +92,6 @@ public abstract class DisplayRecord {
     return threadId;
   }
 
-  public boolean isEndSession() {
-    return false;
-  }
-
-  public boolean isGroupUpdate() {
-    return false;
-  }
-
-  public boolean isGroupQuit() {
-    return false;
-  }
-
-  public boolean isGroupAction() {
-    return isGroupUpdate() || isGroupQuit();
-  }
-
-  public boolean isExpirationTimerUpdate() {
-    return false;
-  }
-
-  public boolean isCallLog() {
-    return false;
-  }
-
-  public boolean isJoined() {
-    return false;
-  }
-
-  public boolean isIncomingCall() {
-    return false;
-  }
-
-  public boolean isOutgoingCall() {
-    return false;
-  }
-
-  public boolean isMissedCall() {
-    return false;
-  }
-
   public boolean isDelivered() {
     return false;
 //    return (deliveryStatus >= SmsDatabase.Status.STATUS_COMPLETE &&