diff --git a/app/src/main/java/be/digitalia/fosdem/activities/SearchResultActivity.java b/app/src/main/java/be/digitalia/fosdem/activities/SearchResultActivity.java
index 9f6cfa3..5554e69 100644
--- a/app/src/main/java/be/digitalia/fosdem/activities/SearchResultActivity.java
+++ b/app/src/main/java/be/digitalia/fosdem/activities/SearchResultActivity.java
@@ -1,6 +1,5 @@
 package be.digitalia.fosdem.activities;
 
-import android.annotation.SuppressLint;
 import android.app.SearchManager;
 import android.content.Context;
 import android.content.Intent;
@@ -93,7 +92,6 @@ public class SearchResultActivity extends AppCompatActivity {
 		}
 	}
 
-	@SuppressLint("NewApi")
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		getMenuInflater().inflate(R.menu.search, menu);
diff --git a/app/src/main/java/be/digitalia/fosdem/widgets/MultiChoiceHelper.java b/app/src/main/java/be/digitalia/fosdem/widgets/MultiChoiceHelper.java
index 5c0f86b..fe1cd38 100644
--- a/app/src/main/java/be/digitalia/fosdem/widgets/MultiChoiceHelper.java
+++ b/app/src/main/java/be/digitalia/fosdem/widgets/MultiChoiceHelper.java
@@ -191,7 +191,7 @@ public class MultiChoiceHelper {
 				if (value) {
 					checkedIdStates.put(id, position);
 				} else {
-					checkedIdStates.delete(id);
+					checkedIdStates.remove(id);
 				}
 			}
 
@@ -356,7 +356,7 @@ public class MultiChoiceHelper {
 					}
 
 					if (!found) {
-						checkedIdStates.delete(id);
+						checkedIdStates.remove(id);
 						checkedIndex--;
 						checkedItemCount--;
 						checkedCountChanged = true;