--- a/dom/bluetooth/bluedroid/BluetoothA2dpManager.cpp
+++ b/dom/bluetooth/bluedroid/BluetoothA2dpManager.cpp
@@ -293,21 +293,17 @@ BluetoothA2dpManager::ResetA2dp()
 void
 BluetoothA2dpManager::ResetAvrcp()
 {
   mAvrcpConnected = false;
   mDuration = 0;
   mMediaNumber = 0;
   mTotalMediaCount = 0;
   mPosition = 0;
-#ifdef MOZ_B2G_BT_API_V2
-  mPlayStatus = ControlPlayStatus::PLAYSTATUS_UNKNOWN;
-#else
   mPlayStatus = ControlPlayStatus::PLAYSTATUS_STOPPED;
-#endif
 }
 
 /*
  * Static functions
  */
 
 static BluetoothA2dpManager::SinkState
 StatusStringToSinkState(const nsAString& aStatus)
@@ -928,28 +924,24 @@ BluetoothA2dpManager::UpdateRegisterNoti
       mPlayPosChangedNotifyType = AVRCP_NTF_INTERIM;
       if (mSinkState == BluetoothA2dpManager::SinkState::SINK_PLAYING) {
         param.mSongPos = mPosition;
       } else {
         param.mSongPos = 0xFFFFFFFF;
       }
       mPlaybackInterval = aParam;
       break;
-#ifdef MOZ_B2G_BT_API_V2
-      // Missing in bluetooth2
-#else
     case AVRCP_EVENT_APP_SETTINGS_CHANGED:
       mAppSettingsChangedNotifyType = AVRCP_NTF_INTERIM;
       param.mNumAttr = 2;
       param.mIds[0] = AVRCP_PLAYER_ATTRIBUTE_REPEAT;
       param.mValues[0] = AVRCP_PLAYER_VAL_OFF_REPEAT;
       param.mIds[1] = AVRCP_PLAYER_ATTRIBUTE_SHUFFLE;
       param.mValues[1] = AVRCP_PLAYER_VAL_OFF_SHUFFLE;
       break;
-#endif
     default:
       break;
   }
 
   sBtAvrcpInterface->RegisterNotificationRsp(aEvent, AVRCP_NTF_INTERIM,
                                              param, nullptr);
 }