diff --git a/src/main/java/no/nibio/vips/logic/controller/session/UserBean.java b/src/main/java/no/nibio/vips/logic/controller/session/UserBean.java
index 25ca99b446296785deaa2b8683a2ad46eba40c98..44d8c6438d2f1630eeb07c381e5b4fb4367fccf1 100755
--- a/src/main/java/no/nibio/vips/logic/controller/session/UserBean.java
+++ b/src/main/java/no/nibio/vips/logic/controller/session/UserBean.java
@@ -215,6 +215,13 @@ public class UserBean {
         user = em.find(VipsLogicUser.class, user.getUserId());
         // Remove all notification subscriptions
         SessionControllerGetter.getMessagingBean().deleteAllNotificationSubscriptions(user);
+        // TODO: Move these objects from user to be deleted to the organization's archive user
+        // * All observations
+        // * All messages
+        // * All POIs
+        // * All non-private forecast configurations
+        //
+        // TODO: Delete all of the user's private forecast configurations and results
         em.remove(user);
     }
     
diff --git a/src/main/java/no/nibio/vips/logic/entity/Organization.java b/src/main/java/no/nibio/vips/logic/entity/Organization.java
index b948b010975321fd4679785c194b5b5a810cfa09..5da5b37227b942e80aa35ca9d6d2e146754fc0db 100755
--- a/src/main/java/no/nibio/vips/logic/entity/Organization.java
+++ b/src/main/java/no/nibio/vips/logic/entity/Organization.java
@@ -39,7 +39,6 @@ import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import javax.persistence.FetchType;
-import org.hibernate.annotations.Type;
 
 /**
  * @copyright 2013 <a href="http://www.nibio.no/">NIBIO</a>