diff --git a/call/audio_state.h b/call/audio_state.h
index 1332c053f7..967314b067 100644
--- a/call/audio_state.h
+++ b/call/audio_state.h
@@ -65,7 +65,6 @@ class AudioState : public rtc::RefCountInterface {
   virtual Stats GetAudioInputStats() const = 0;
   virtual void SetStereoChannelSwapping(bool enable) = 0;
 
-  // TODO(solenberg): Replace scoped_refptr with shared_ptr once we can use it.
   static rtc::scoped_refptr<AudioState> Create(
       const AudioState::Config& config);
 
diff --git a/call/call_config.h b/call/call_config.h
index 67ccd51f19..260a3accdd 100644
--- a/call/call_config.h
+++ b/call/call_config.h
@@ -33,11 +33,9 @@ struct CallConfig {
   BitrateConstraints bitrate_config;
 
   // AudioState which is possibly shared between multiple calls.
-  // TODO(solenberg): Change this to a shared_ptr once we can use C++11.
   rtc::scoped_refptr<AudioState> audio_state;
 
   // Audio Processing Module to be used in this call.
-  // TODO(solenberg): Change this to a shared_ptr once we can use C++11.
   AudioProcessing* audio_processing = nullptr;
 
   // RtcEventLog to use for this call. Required.
diff --git a/pc/dtmf_sender.cc b/pc/dtmf_sender.cc
index f4c3617272..7c1d3c156a 100644
--- a/pc/dtmf_sender.cc
+++ b/pc/dtmf_sender.cc
@@ -77,8 +77,6 @@ DtmfSender::DtmfSender(rtc::Thread* signaling_thread,
       duration_(kDtmfDefaultDurationMs),
       inter_tone_gap_(kDtmfDefaultGapMs) {
   RTC_DCHECK(signaling_thread_);
-  // TODO(deadbeef): Once we can use shared_ptr and weak_ptr,
-  // do that instead of relying on a "destroyed" signal.
   if (provider_) {
     RTC_DCHECK(provider_->GetOnDestroyedSignal());
     provider_->GetOnDestroyedSignal()->connect(