diff -r 94ed9cfdb123 -r 16066379860c src/main/scala/fis/crm/model/Contact.scala
--- a/src/main/scala/fis/crm/model/Contact.scala	Mon Apr 02 00:48:43 2012 +0200
+++ b/src/main/scala/fis/crm/model/Contact.scala	Mon Apr 02 01:14:48 2012 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 Tomas Zeman <tzeman@volny.cz>
+ * Copyright 2011-2012 Tomas Zeman <tzeman@volny.cz>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package fis.crm.model
 
-import fis.base.model.{Entity, EntityUnion, MetaEntity}
+import fis.base.model.{Entity, MetaEntity}
 import net.liftweb.common._
 import net.liftweb.http.S
 import net.liftweb.record.{MetaRecord, Record}
@@ -56,8 +56,6 @@
 
   override def linkName = lastName.get + " " + firstName.get
 
-  lazy val entities = CrmSchema.entityContacts.right(this)
-
   def fieldsForView = List(lastName, firstName, position, workMail, workMobile,
     workPhone, privateMail, privateMobile, privatePhone, fax,
     otherMail, otherMobile, note)
@@ -79,10 +77,6 @@
   def delete(c: Contact) = getTable.delete(c.id)
 }
 
-trait ContactsAware { self: Entity[_] =>
-  lazy val contacts = CrmSchema.entityContacts.left(EntityUnion(this))
-}
-
 import org.squeryl.KeyedEntity
 import org.squeryl.dsl.CompositeKey3
 
@@ -90,9 +84,6 @@
   val typeId: Long) extends KeyedEntity[CompositeKey3[Long, Long, Long]] {
 
   def id = CompositeKey3(entityId, contactId, typeId)
-
-  lazy val contactType =
-    CrmSchema.contactTypeToEntityContacts.rightStateful(this)
 }
 
 // vim: set ts=2 sw=2 et: