diff --git a/webrtc/api/peerconnectioninterface.h b/webrtc/api/peerconnectioninterface.h
index 0c9198cd01..950dad8f0b 100644
--- a/webrtc/api/peerconnectioninterface.h
+++ b/webrtc/api/peerconnectioninterface.h
@@ -965,8 +965,11 @@ class PeerConnectionFactoryInterface : public rtc::RefCountInterface {
   virtual rtc::scoped_refptr<AudioSourceInterface> CreateAudioSource(
       const MediaConstraintsInterface* constraints) = 0;
 
-  // Creates a VideoTrackSourceInterface. The new source takes ownership of
-  // |capturer|.
+  // Creates a VideoTrackSourceInterface from |capturer|.
+  // TODO(deadbeef): We should aim to remove cricket::VideoCapturer from the
+  // API. It's mainly used as a wrapper around webrtc's provided
+  // platform-specific capturers, but these should be refactored to use
+  // VideoTrackSourceInterface directly.
   // TODO(deadbeef): Make pure virtual once downstream mock PC factory classes
   // are updated.
   virtual rtc::scoped_refptr<VideoTrackSourceInterface> CreateVideoSource(
diff --git a/webrtc/pc/peerconnectionfactory.cc b/webrtc/pc/peerconnectionfactory.cc
index 743f51702c..74a693d240 100644
--- a/webrtc/pc/peerconnectionfactory.cc
+++ b/webrtc/pc/peerconnectionfactory.cc
@@ -209,8 +209,6 @@ bool PeerConnectionFactory::Initialize() {
     return false;
   }
 
-  // TODO:  Need to make sure only one VoE is created inside
-  // WebRtcMediaEngine.
   std::unique_ptr<cricket::MediaEngineInterface> media_engine =
       worker_thread_->Invoke<std::unique_ptr<cricket::MediaEngineInterface>>(
           RTC_FROM_HERE,
diff --git a/webrtc/pc/videocapturertracksource.h b/webrtc/pc/videocapturertracksource.h
index af87cc9b82..1a2529b1b6 100644
--- a/webrtc/pc/videocapturertracksource.h
+++ b/webrtc/pc/videocapturertracksource.h
@@ -33,8 +33,7 @@ class MediaConstraintsInterface;
 class VideoCapturerTrackSource : public VideoTrackSource,
                                  public sigslot::has_slots<> {
  public:
-  // Creates an instance of VideoCapturerTrackSource.
-  // VideoCapturerTrackSource takes ownership of |capturer|.
+  // Creates an instance of VideoCapturerTrackSource from |capturer|.
   // |constraints| can be NULL and in that case the camera is opened using a
   // default resolution.
   static rtc::scoped_refptr<VideoTrackSourceInterface> Create(