diff --git a/Firestore/Example/Tests/Integration/API/FIRFirestoreSourceTests.mm b/Firestore/Example/Tests/Integration/API/FIRFirestoreSourceTests.mm
index 3843b8b4fcb..880443b7838 100644
--- a/Firestore/Example/Tests/Integration/API/FIRFirestoreSourceTests.mm
+++ b/Firestore/Example/Tests/Integration/API/FIRFirestoreSourceTests.mm
@@ -713,46 +713,4 @@ - (void)Demo_addSnapshotListenerWithDefaultListenOptions {
                                  XCTAssertEqual(snapshot.count, 0);
                                }];
 }
-
-//- (void)Demo_addSnapshotListenerWithMetadataChanges {
-//  FIRCollectionReference *collection = [self.db collectionWithPath:@"cities"];
-//  FIRQuery *query = [collection queryWhereField:@"state" isEqualTo:@ "CA"];
-//  FIRSnapshotListenOptions* options = [
-//      FIRSnapshotListenOptions optionsWithIncludeMetadataChanges:YES
-//  ];
-//
-//  [query addSnapshotListenerWithOptions:options
-//                               listener:^(FIRQuerySnapshot *snapshot, NSError *error) {
-//                                 XCTAssertNil(error);
-//                                 XCTAssertEqual(snapshot.count, 0);
-//                               }];
-//}
-//
-//- (void)Demo_addSnapshotListenerFromCache {
-//  FIRCollectionReference *collection = [self.db collectionWithPath:@"cities"];
-//  FIRQuery *query = [collection queryWhereField:@"state" isEqualTo:@ "CA"];
-//  FIRSnapshotListenOptions* options = [
-//      FIRSnapshotListenOptions optionsWithSource:FIRListenSourceCache
-//  ];
-//
-//  [query addSnapshotListenerWithOptions:options
-//                               listener:^(FIRQuerySnapshot *snapshot, NSError *error) {
-//                                 XCTAssertNil(error);
-//                                 XCTAssertEqual(snapshot.count, 0);
-//                               }];
-//}
-//
-//- (void)Demo_addSnapshotListenerFromCacheAndIncludeMetadataChanges {
-//  FIRCollectionReference *collection = [self.db collectionWithPath:@"cities"];
-//  FIRQuery *query = [collection queryWhereField:@"state" isEqualTo:@ "CA"];
-//
-//  FIRSnapshotListenOptions *options = [[FIRSnapshotListenOptions alloc]
-//  initWithSource:FIRListenSourceCache includeMetadataChanges:YES];
-//
-//  [query addSnapshotListenerWithOptions:options
-//                               listener:^(FIRQuerySnapshot *snapshot, NSError *error) {
-//                                 XCTAssertNil(error);
-//                                 XCTAssertEqual(snapshot.count, 0);
-//                               }];
-//}
 @end
diff --git a/Firestore/Source/API/FIRDocumentReference.mm b/Firestore/Source/API/FIRDocumentReference.mm
index faadf1756ee..9a6e3fd94e6 100644
--- a/Firestore/Source/API/FIRDocumentReference.mm
+++ b/Firestore/Source/API/FIRDocumentReference.mm
@@ -212,7 +212,6 @@ - (void)getDocumentWithSource:(FIRFirestoreSource)source
   return [self addSnapshotListenerInternalWithOptions:options listener:listener];
 }
 
-// TODO MILA
 - (id<FIRListenerRegistration>)addSnapshotListenerWithOptions:(FIRSnapshotListenOptions *)options
                                                      listener:(FIRDocumentSnapshotBlock)listener {
   ListenOptions listenOptions = ListenOptions::FromIncludeMetadataChanges(false);
diff --git a/Firestore/Source/API/FIRQuery.mm b/Firestore/Source/API/FIRQuery.mm
index ab3ef0992ed..4adba59744f 100644
--- a/Firestore/Source/API/FIRQuery.mm
+++ b/Firestore/Source/API/FIRQuery.mm
@@ -191,7 +191,6 @@ - (void)getDocumentsWithSource:(FIRFirestoreSource)publicSource
   return [self addSnapshotListenerInternalWithOptions:options listener:listener];
 }
 
-// TODO MILA
 - (id<FIRListenerRegistration>)addSnapshotListenerWithOptions:(FIRSnapshotListenOptions *)options
                                                      listener:(FIRQuerySnapshotBlock)listener {
   auto listenOptions = ListenOptions::FromIncludeMetadataChanges(false);