diff --git a/src/source/building-devices.md b/src/source/building-devices.md
index f47de4e..f298e5a 100644
--- a/src/source/building-devices.md
+++ b/src/source/building-devices.md
@@ -117,9 +117,9 @@
 
 Device   | Branch           | Build configuration
 ---------|------------------|------------------------
-crespo   | android-2.3.4_r1 | full_crespo-userdebug
-crespo4g | gingerbread      | full_crespo4g-userdebug
-passion  | android-2.3.4_r1 | full_passion-userdebug
+crespo   | android-2.3.5_r1 | full_crespo-userdebug
+crespo4g | android-2.3.5_r1 | full_crespo4g-userdebug
+passion  | android-2.3.5_r1 | full_passion-userdebug
 sapphire | android-2.2.2_r1 | full_sapphire-userdebug
 dream    | android-2.2.2_r1 | full_dream-userdebug
 
@@ -162,6 +162,7 @@
 2.3.2 (GRH78C)  | I9020XXJK1           | I9020XXJK8
 2.3.3 (GRI40)   | I9020XXKA3           | I9020XXKB1      | All previous versions
 2.3.4 (GRJ22)   | I9020XXKA3           | I9020XXKD1      | All previous versions
+2.3.5 (GRJ90)   | I9020XXKA3           | I9020XXKF1      | All previous versions
 
 Nexus S (850MHz version "UC"):
 
@@ -169,6 +170,7 @@
 ----------------|----------------------|-----------------|--------------
 2.3.3 (GRI54)   | I9020XXKA3           | I9020UCKB2
 2.3.4 (GRJ22)   | I9020XXKA3           | I9020UCKD1      | All previous versions
+2.3.5 (GRJ90)   | I9020XXKA3           | I9020UCKF1      | All previous versions
 
 Nexus S (Korea version "KR"):
 
@@ -176,6 +178,7 @@
 ----------------|----------------------|-----------------|--------------
 2.3.3 (GRI54)   | I9020XXKA3           | I9020KRKB3
 2.3.4 (GRJ22)   | I9020XXKA3           | M200KRKC1       | All previous versions
+2.3.5 (GRJ90)   | I9020XXKA3           | M200KRKC1       | All previous versions
 
 Nexus S 4G:
 
@@ -183,6 +186,7 @@
 ----------------|----------------------|-----------------|--------------
 2.3.4 (GRJ06D)  | D720SPRKC5           | D720SPRKC9
 2.3.4 (GRJ22)   | D720SPRKC5           | D720SPRKD8      | All previous versions
+2.3.5 (GRJ90)   | D720SPRKC5           | D720SPRKE5      | All previous versions
 
 If you're building a new version of Android, if your Nexus S or Nexus S 4G has
 an older bootloader and radio image that is marked as being also possible in
diff --git a/src/tech/bluetooth/index.md b/src/tech/bluetooth/index.md
deleted file mode 100644
index 2f5d459..0000000
--- a/src/tech/bluetooth/index.md
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-   Copyright 2011 The Android Open Source Project 
-
-   Licensed under the Apache License, Version 2.0 (the "License"); 
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-# Bluetooth Technical Information #
-*Placeholder*
-
-The Android Open-Source Project includes a bluetooth subsystem currently based
-on the upstream bluez project. Android then layers various IPC and similar
-libraries to link the bluez library with the Android Bluetooth stack and API.
-
diff --git a/src/tech/index.md b/src/tech/index.md
index cdcaac0..9bf5867 100644
--- a/src/tech/index.md
+++ b/src/tech/index.md
@@ -30,24 +30,6 @@
 [&raquo; Dalvik Information](/tech/dalvik/index.html)
 
 
-## Bluetooth Technical Information ##
-The Android Open-Source Project includes a bluetooth subsystem currently based
-on the upstream bluez project. Android then layers various IPC and similar
-libraries to link the bluez library with the Android Bluetooth stack and API.
-
-[&raquo; Bluetooth Information](/tech/bluetooth/index.html)
-
-
-## NFC Technical Information ##
-The Android Open-Source Project also includes an NFC implementation. Unlike
-the Android Bluetooth stack, much of the Android NFC stack is new code
-originally contributed to the Android Open-Source Project. This code links the
-Android NFC API to a device's NFC hardware. This section also includes
-information on related Android technologies, such as the simple NDEF Push
-Protocol.
-
-[&raquo; NFC Information](/tech/nfc/index.html)
-
 ## Encryption Technical Information ##
 The Android Open-Source Project includes the ability to encrypt the user's data.
 This document is written for 3rd parties developing Android devices who want to
diff --git a/src/tech/nfc/index.md b/src/tech/nfc/index.md
deleted file mode 100644
index 94a41dd..0000000
--- a/src/tech/nfc/index.md
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-   Copyright 2010 The Android Open Source Project 
-
-   Licensed under the Apache License, Version 2.0 (the "License"); 
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-# NFC Technical Information #
-*Placeholder*
-
-The Android Open-Source Project also includes an NFC implementation. Unlike
-the Android Bluetooth stack, much of the Android NFC stack is new code
-originally contributed to the Android Open-Source Project. This code links the
-Android NFC API to a device's NFC hardware. This section also includes
-information on related Android technologies, such as the simple NDEF Push
-Protocol.
diff --git a/src/tech/sidebar.md b/src/tech/sidebar.md
index d1d6dbb..b770eb8 100644
--- a/src/tech/sidebar.md
+++ b/src/tech/sidebar.md
@@ -1,5 +1,3 @@
 # Topics #
-- [Bluetooth](/tech/bluetooth/index.html)
 - [Dalvik](/tech/dalvik/index.html)
 - [Encryption](/tech/encryption/index.html)
-- [NFC](/tech/nfc/index.html)