diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index 97f2d89..6541579 100644
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -139,12 +139,6 @@
             </intent-filter>
         </receiver>
 
-        <receiver android:name="SuggestionSpanPickedNotificationReceiver" android:enabled="true">
-            <intent-filter>
-                <action android:name="android.text.style.SUGGESTION_PICKED" />
-            </intent-filter>
-        </receiver>
-
         <receiver android:name="com.android.inputmethod.dictionarypack.EventHandler">
             <intent-filter>
                 <action android:name="android.intent.action.DOWNLOAD_COMPLETE" />
diff --git a/java/src/com/android/inputmethod/latin/SuggestionSpanPickedNotificationReceiver.java b/java/src/com/android/inputmethod/latin/SuggestionSpanPickedNotificationReceiver.java
deleted file mode 100644
index 08785f3..0000000
--- a/java/src/com/android/inputmethod/latin/SuggestionSpanPickedNotificationReceiver.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 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.
- */
-
-package com.android.inputmethod.latin;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.text.style.SuggestionSpan;
-import android.util.Log;
-
-import com.android.inputmethod.latin.define.DebugFlags;
-
-public final class SuggestionSpanPickedNotificationReceiver extends BroadcastReceiver {
-    private static final boolean DBG = DebugFlags.DEBUG_ENABLED;
-    private static final String TAG =
-            SuggestionSpanPickedNotificationReceiver.class.getSimpleName();
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        if (SuggestionSpan.ACTION_SUGGESTION_PICKED.equals(intent.getAction())) {
-            if (DBG) {
-                final String before = intent.getStringExtra(
-                        SuggestionSpan.SUGGESTION_SPAN_PICKED_BEFORE);
-                final String after = intent.getStringExtra(
-                        SuggestionSpan.SUGGESTION_SPAN_PICKED_AFTER);
-                Log.d(TAG, "Received notification picked: " + before + "," + after);
-            }
-        }
-    }
-}