Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/model/Leaderselection.java
===================================================================
diff -u -r6f9041abdcbc64a47af95ec0932c03c9c04e0838 -r439dc8c74e7d6a7dd5ba26b021f0806ee19d8291
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/model/Leaderselection.java	(.../Leaderselection.java)	(revision 6f9041abdcbc64a47af95ec0932c03c9c04e0838)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/model/Leaderselection.java	(.../Leaderselection.java)	(revision 439dc8c74e7d6a7dd5ba26b021f0806ee19d8291)
@@ -21,7 +21,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.tool.leaderselection.model;
 
 import java.util.Date;
@@ -33,7 +32,6 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
@@ -74,9 +72,8 @@
 
     @Column(name = "tool_content_id")
     private Long toolContentId;
-    
+
     @OneToMany(mappedBy = "leaderselection")
-    @JoinColumn(name = "leaderselection_uid")
     private Set<LeaderselectionSession> leaderselectionSessions = new HashSet<>();
 
     public Long getUid() {
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/model/LeaderselectionSession.java
===================================================================
diff -u -r6f9041abdcbc64a47af95ec0932c03c9c04e0838 -r439dc8c74e7d6a7dd5ba26b021f0806ee19d8291
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/model/LeaderselectionSession.java	(.../LeaderselectionSession.java)	(revision 6f9041abdcbc64a47af95ec0932c03c9c04e0838)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/model/LeaderselectionSession.java	(.../LeaderselectionSession.java)	(revision 439dc8c74e7d6a7dd5ba26b021f0806ee19d8291)
@@ -21,14 +21,12 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.tool.leaderselection.model;
 
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -37,7 +35,6 @@
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
 import javax.persistence.Table;
 
 import org.apache.log4j.Logger;
@@ -76,7 +73,6 @@
     private Leaderselection leaderselection;
 
     @OneToMany(mappedBy = "leaderselectionSession")
-    @JoinColumn(name = "leaderselection_session_uid")
     private Set<LeaderselectionUser> users = new HashSet<>();
 
     @ManyToOne