diff --git a/app/src/main/java/ch/nuth/zhaw/exbox/MyList.java b/app/src/main/java/ch/nuth/zhaw/exbox/MyList.java
index bbb5485..d66076d 100644
--- a/app/src/main/java/ch/nuth/zhaw/exbox/MyList.java
+++ b/app/src/main/java/ch/nuth/zhaw/exbox/MyList.java
@@ -197,15 +197,14 @@ public class MyList extends AbstractList<Object> {
     }
 
     @Override
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     public boolean remove(Object o) {
         for (IListNode node = getAnchor().getNextNode(); node != getAnchor(); node = node.getNextNode()) {
             boolean isEqual = false;
 
             try {
-                isEqual = ((Comparable<Object>)o).compareTo((node.getItem())) == 0;
-            }
-            catch (Exception e) {
+                isEqual = ((Comparable) o).compareTo((node.getItem())) == 0;
+            } catch (Exception e) {
                 isEqual = node.getItem() == o;
             }