diff --git a/application/models/accounting/Aufteilung_model.php b/application/models/accounting/Aufteilung_model.php
deleted file mode 100644
index bacd50404..000000000
--- a/application/models/accounting/Aufteilung_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Aufteilung_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'wawi.tbl_aufteilung';
-		$this->pk = 'aufteilung_id';
-	}
-}
diff --git a/application/models/accounting/Bestelldetail_model.php b/application/models/accounting/Bestelldetail_model.php
deleted file mode 100644
index dd57002d1..000000000
--- a/application/models/accounting/Bestelldetail_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Bestelldetail_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'wawi.tbl_bestelldetail';
-		$this->pk = 'bestelldetail_id';
-	}
-}
diff --git a/application/models/accounting/Bestelldetailtag_model.php b/application/models/accounting/Bestelldetailtag_model.php
deleted file mode 100644
index a760c26a2..000000000
--- a/application/models/accounting/Bestelldetailtag_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Bestelldetailtag_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'wawi.tbl_bestelldetailtag';
-		$this->pk = array('bestelldetail_id', 'tag');
-	}
-}
diff --git a/application/models/accounting/Bestellstatus_model.php b/application/models/accounting/Bestellstatus_model.php
deleted file mode 100644
index 0f9810818..000000000
--- a/application/models/accounting/Bestellstatus_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Bestellstatus_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'wawi.tbl_bestellstatus';
-		$this->pk = 'bestellstatus_kurzbz';
-	}
-}
diff --git a/application/models/accounting/Bestellung_model.php b/application/models/accounting/Bestellung_model.php
deleted file mode 100644
index 0d0ea37f8..000000000
--- a/application/models/accounting/Bestellung_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Bestellung_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'wawi.tbl_bestellung';
-		$this->pk = 'bestellung_id';
-	}
-}
diff --git a/application/models/accounting/Bestellungtag_model.php b/application/models/accounting/Bestellungtag_model.php
deleted file mode 100644
index 77c7416f5..000000000
--- a/application/models/accounting/Bestellungtag_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Bestellungtag_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'wawi.tbl_bestellungtag';
-		$this->pk = array('bestellung_id', 'tag');
-	}
-}
diff --git a/application/models/accounting/Buchung_model.php b/application/models/accounting/Buchung_model.php
deleted file mode 100644
index adc700dfc..000000000
--- a/application/models/accounting/Buchung_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Buchung_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'wawi.tbl_buchung';
-		$this->pk = 'buchung_id';
-	}
-}
diff --git a/application/models/accounting/Buchungstyp_model.php b/application/models/accounting/Buchungstyp_model.php
deleted file mode 100644
index 7ed47217d..000000000
--- a/application/models/accounting/Buchungstyp_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Buchungstyp_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'wawi.tbl_buchungstyp';
-		$this->pk = 'buchungstyp_kurzbz';
-	}
-}
diff --git a/application/models/accounting/Budget_model.php b/application/models/accounting/Budget_model.php
deleted file mode 100644
index f425f3479..000000000
--- a/application/models/accounting/Budget_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Budget_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'wawi.tbl_budget';
-		$this->pk = array('kostenstelle_id', 'geschaeftsjahr_kurzbz');
-	}
-}
diff --git a/application/models/accounting/Rechnung_model.php b/application/models/accounting/Rechnung_model.php
deleted file mode 100644
index 6e5ddcf83..000000000
--- a/application/models/accounting/Rechnung_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Rechnung_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'wawi.tbl_rechnung';
-		$this->pk = 'rechnung_id';
-	}
-}
diff --git a/application/models/accounting/Rechnungsbetrag_model.php b/application/models/accounting/Rechnungsbetrag_model.php
deleted file mode 100644
index 11617429c..000000000
--- a/application/models/accounting/Rechnungsbetrag_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Rechnungsbetrag_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'wawi.tbl_rechnungsbetrag';
-		$this->pk = 'rechnungsbetrag_id';
-	}
-}
diff --git a/application/models/accounting/Rechnungstyp_model.php b/application/models/accounting/Rechnungstyp_model.php
deleted file mode 100644
index 3f1e0633e..000000000
--- a/application/models/accounting/Rechnungstyp_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Rechnungstyp_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'wawi.tbl_rechnungstyp';
-		$this->pk = 'rechnungstyp_kurzbz';
-	}
-}
diff --git a/application/models/accounting/Vertrag_model.php b/application/models/accounting/Vertrag_model.php
deleted file mode 100644
index cd4b466d6..000000000
--- a/application/models/accounting/Vertrag_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Vertrag_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_vertrag';
-		$this->pk = 'vertrag_id';
-	}
-}
diff --git a/application/models/accounting/Vertragsstatus_model.php b/application/models/accounting/Vertragsstatus_model.php
deleted file mode 100644
index 21367b84a..000000000
--- a/application/models/accounting/Vertragsstatus_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Vertragsstatus_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_vertragsstatus';
-		$this->pk = 'vertragsstatus_kurzbz';
-	}
-}
diff --git a/application/models/accounting/Vertragstyp_model.php b/application/models/accounting/Vertragstyp_model.php
deleted file mode 100644
index 42d248217..000000000
--- a/application/models/accounting/Vertragstyp_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Vertragstyp_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_vertragstyp';
-		$this->pk = 'vertragstyp_kurzbz';
-	}
-}
diff --git a/application/models/accounting/Zahlungstyp_model.php b/application/models/accounting/Zahlungstyp_model.php
deleted file mode 100644
index 5ab7350ab..000000000
--- a/application/models/accounting/Zahlungstyp_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Zahlungstyp_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'wawi.tbl_zahlungstyp';
-		$this->pk = 'zahlungstyp_kurzbz';
-	}
-}
diff --git a/application/models/codex/Akadgrad_model.php b/application/models/codex/Akadgrad_model.php
deleted file mode 100644
index 0623ef3ab..000000000
--- a/application/models/codex/Akadgrad_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Akadgrad_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_akadgrad';
-		$this->pk = 'akadgrad_id';
-	}
-}
diff --git a/application/models/codex/Archiv_model.php b/application/models/codex/Archiv_model.php
deleted file mode 100644
index 45cde5a00..000000000
--- a/application/models/codex/Archiv_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Archiv_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'bis.tbl_archiv';
-		$this->pk = 'archiv_id';
-	}
-}
diff --git a/application/models/codex/Aufmerksamdurch_model.php b/application/models/codex/Aufmerksamdurch_model.php
deleted file mode 100644
index 2c5f5d2c6..000000000
--- a/application/models/codex/Aufmerksamdurch_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Aufmerksamdurch_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_aufmerksamdurch';
-		$this->pk = 'aufmerksamdurch_kurzbz';
-	}
-}
diff --git a/application/models/codex/Ausbildung_model.php b/application/models/codex/Ausbildung_model.php
deleted file mode 100644
index 8cadcb92d..000000000
--- a/application/models/codex/Ausbildung_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Ausbildung_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'bis.tbl_ausbildung';
-		$this->pk = 'ausbildungcode';
-	}
-}
diff --git a/application/models/codex/Berufstaetigkeit_model.php b/application/models/codex/Berufstaetigkeit_model.php
deleted file mode 100644
index 59b39d775..000000000
--- a/application/models/codex/Berufstaetigkeit_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Berufstaetigkeit_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'bis.tbl_berufstaetigkeit';
-		$this->pk = 'berufstaetigkeit_code';
-	}
-}
diff --git a/application/models/codex/Beschaeftigungsausmass_model.php b/application/models/codex/Beschaeftigungsausmass_model.php
deleted file mode 100644
index 3b54fa310..000000000
--- a/application/models/codex/Beschaeftigungsausmass_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Beschaeftigungsausmass_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'bis.tbl_beschaeftigungsausmass';
-		$this->pk = 'beschausmasscode';
-	}
-}
diff --git a/application/models/codex/Besqual_model.php b/application/models/codex/Besqual_model.php
deleted file mode 100644
index b89cb123a..000000000
--- a/application/models/codex/Besqual_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Besqual_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'bis.tbl_besqual';
-		$this->pk = 'besqualcode';
-	}
-}
diff --git a/application/models/codex/Bisfunktion_model.php b/application/models/codex/Bisfunktion_model.php
deleted file mode 100644
index 72135ecc0..000000000
--- a/application/models/codex/Bisfunktion_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Bisfunktion_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'bis.tbl_bisfunktion';
-		$this->pk = array('studiengang_kz', 'bisverwendung_id');
-	}
-}
diff --git a/application/models/codex/Bisio_model.php b/application/models/codex/Bisio_model.php
deleted file mode 100644
index 5f35aec9a..000000000
--- a/application/models/codex/Bisio_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Bisio_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'bis.tbl_bisio';
-		$this->pk = 'bisio_id';
-	}
-}
diff --git a/application/models/codex/Bisorgform_model.php b/application/models/codex/Bisorgform_model.php
deleted file mode 100644
index c489c849c..000000000
--- a/application/models/codex/Bisorgform_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Bisorgform_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'bis.tbl_bisorgform';
-		$this->pk = 'bisorgform_kurzbz';
-	}
-}
diff --git a/application/models/codex/Bisverwendung_model.php b/application/models/codex/Bisverwendung_model.php
deleted file mode 100644
index fa2cf84d0..000000000
--- a/application/models/codex/Bisverwendung_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Bisverwendung_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'bis.tbl_bisverwendung';
-		$this->pk = 'bisverwendung_id';
-	}
-}
diff --git a/application/models/codex/Bundesland_model.php b/application/models/codex/Bundesland_model.php
deleted file mode 100644
index 03a4774ce..000000000
--- a/application/models/codex/Bundesland_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Bundesland_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'bis.tbl_bundesland';
-		$this->pk = 'bundesland_code';
-	}
-}
diff --git a/application/models/codex/Entwicklungsteam_model.php b/application/models/codex/Entwicklungsteam_model.php
deleted file mode 100644
index 5cf21c23b..000000000
--- a/application/models/codex/Entwicklungsteam_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Entwicklungsteam_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'bis.tbl_entwicklungsteam';
-		$this->pk = array('studiengang_kz', 'mitarbeiter_uid');
-	}
-}
diff --git a/application/models/codex/Gemeinde_model.php b/application/models/codex/Gemeinde_model.php
deleted file mode 100644
index c782346a0..000000000
--- a/application/models/codex/Gemeinde_model.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-class Gemeinde_model extends DB_Model
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = "bis.tbl_gemeinde";
-		$this->pk = "gemeinde_id";
-	}
-	
-	public function getGemeindeByPlz($plz)
-	{
-		$this->addSelect("DISTINCT ON (ortschaftsname) ortschaftsname, gemeinde_id, plz, name, ortschaftskennziffer, bulacode, bulabez, kennziffer");
-		$this->addOrder("ortschaftsname");
-		
-		return $this->loadWhere(array("plz" => $plz));
-	}
-}
\ No newline at end of file
diff --git a/application/models/codex/Hauptberuf_model.php b/application/models/codex/Hauptberuf_model.php
deleted file mode 100644
index 7ae7ee44d..000000000
--- a/application/models/codex/Hauptberuf_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Hauptberuf_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'bis.tbl_hauptberuf';
-		$this->pk = 'hauptberufcode';
-	}
-}
diff --git a/application/models/codex/Lehrform_model.php b/application/models/codex/Lehrform_model.php
deleted file mode 100644
index dc53b3085..000000000
--- a/application/models/codex/Lehrform_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Lehrform_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_lehrform';
-		$this->pk = 'lehrform_kurzbz';
-	}
-}
diff --git a/application/models/codex/Lgartcode_model.php b/application/models/codex/Lgartcode_model.php
deleted file mode 100644
index a2c09c00e..000000000
--- a/application/models/codex/Lgartcode_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Lgartcode_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'bis.tbl_lgartcode';
-		$this->pk = 'lgartcode';
-	}
-}
diff --git a/application/models/codex/Mobilitaetsprogramm_model.php b/application/models/codex/Mobilitaetsprogramm_model.php
deleted file mode 100644
index 5fd46e725..000000000
--- a/application/models/codex/Mobilitaetsprogramm_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Mobilitaetsprogramm_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'bis.tbl_mobilitaetsprogramm';
-		$this->pk = 'mobilitaetsprogramm_code';
-	}
-}
diff --git a/application/models/codex/Nation_model.php b/application/models/codex/Nation_model.php
deleted file mode 100644
index 239639795..000000000
--- a/application/models/codex/Nation_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-class Nation_model extends DB_Model
-{
-	/**
-	 * 
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'bis.tbl_nation';
-		$this->pk = 'nation_code';
-	}
-}
\ No newline at end of file
diff --git a/application/models/codex/Note_model.php b/application/models/codex/Note_model.php
deleted file mode 100644
index e83ee2f48..000000000
--- a/application/models/codex/Note_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Note_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_note';
-		$this->pk = 'note';
-	}
-}
diff --git a/application/models/codex/Verwendung_model.php b/application/models/codex/Verwendung_model.php
deleted file mode 100644
index 509b0388b..000000000
--- a/application/models/codex/Verwendung_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Verwendung_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'bis.tbl_verwendung';
-		$this->pk = 'verwendung_code';
-	}
-}
diff --git a/application/models/codex/Zgv_model.php b/application/models/codex/Zgv_model.php
deleted file mode 100644
index 1e1ba99ad..000000000
--- a/application/models/codex/Zgv_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Zgv_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'bis.tbl_zgv';
-		$this->pk = 'zgv_code';
-	}
-}
diff --git a/application/models/codex/Zgvdoktor_model.php b/application/models/codex/Zgvdoktor_model.php
deleted file mode 100644
index 8caf397e0..000000000
--- a/application/models/codex/Zgvdoktor_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Zgvdoktor_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'bis.tbl_zgvdoktor';
-		$this->pk = 'zgvdoktor_code';
-	}
-}
diff --git a/application/models/codex/Zgvgruppe_model.php b/application/models/codex/Zgvgruppe_model.php
deleted file mode 100644
index 69da70271..000000000
--- a/application/models/codex/Zgvgruppe_model.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-class Zgvgruppe_model extends DB_Model
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'bis.tbl_zgvgruppe';
-		$this->pk = 'gruppe_kurzbz';
-	}
-}
\ No newline at end of file
diff --git a/application/models/codex/Zgvmaster_model.php b/application/models/codex/Zgvmaster_model.php
deleted file mode 100644
index 38f8a0dcb..000000000
--- a/application/models/codex/Zgvmaster_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Zgvmaster_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'bis.tbl_zgvmaster';
-		$this->pk = 'zgvmas_code';
-	}
-}
diff --git a/application/models/codex/Zweck_model.php b/application/models/codex/Zweck_model.php
deleted file mode 100644
index 600e9fb40..000000000
--- a/application/models/codex/Zweck_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Zweck_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'bis.tbl_zweck';
-		$this->pk = 'zweck_code';
-	}
-}
diff --git a/application/models/content/Content_model.php b/application/models/content/Content_model.php
deleted file mode 100644
index ee4315ebd..000000000
--- a/application/models/content/Content_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Content_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'campus.tbl_content';
-		$this->pk = 'content_id';
-	}
-}
diff --git a/application/models/content/Contentchild_model.php b/application/models/content/Contentchild_model.php
deleted file mode 100644
index 11738d144..000000000
--- a/application/models/content/Contentchild_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Contentchild_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'campus.tbl_contentchild';
-		$this->pk = 'contentchild_id';
-	}
-}
diff --git a/application/models/content/Contentgruppe_model.php b/application/models/content/Contentgruppe_model.php
deleted file mode 100644
index 03efc87b1..000000000
--- a/application/models/content/Contentgruppe_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Contentgruppe_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'campus.tbl_contentgruppe';
-		$this->pk = array('gruppe_kurzbz', 'content_id');
-	}
-}
diff --git a/application/models/content/Contentlog_model.php b/application/models/content/Contentlog_model.php
deleted file mode 100644
index 025cb94aa..000000000
--- a/application/models/content/Contentlog_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Contentlog_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'campus.tbl_contentlog';
-		$this->pk = 'contentlog_id';
-	}
-}
diff --git a/application/models/content/Contentsprache_model.php b/application/models/content/Contentsprache_model.php
deleted file mode 100644
index eb7e257b2..000000000
--- a/application/models/content/Contentsprache_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Contentsprache_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'campus.tbl_contentsprache';
-		$this->pk = 'contentsprache_id';
-	}
-}
diff --git a/application/models/content/Infoscreen_model.php b/application/models/content/Infoscreen_model.php
deleted file mode 100644
index c4134ff06..000000000
--- a/application/models/content/Infoscreen_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Infoscreen_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'campus.tbl_infoscreen';
-		$this->pk = 'infoscreen_id';
-	}
-}
diff --git a/application/models/content/News_model.php b/application/models/content/News_model.php
deleted file mode 100644
index 8d636d808..000000000
--- a/application/models/content/News_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class News_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'campus.tbl_news';
-		$this->pk = 'news_id';
-	}
-}
diff --git a/application/models/content/Template_model.php b/application/models/content/Template_model.php
deleted file mode 100644
index 6f452e23c..000000000
--- a/application/models/content/Template_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Template_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'campus.tbl_template';
-		$this->pk = 'template_kurzbz';
-	}
-}
diff --git a/application/models/content/Veranstaltung_model.php b/application/models/content/Veranstaltung_model.php
deleted file mode 100644
index 48e7bc2cc..000000000
--- a/application/models/content/Veranstaltung_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Veranstaltung_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'campus.tbl_veranstaltung';
-		$this->pk = 'veranstaltung_id';
-	}
-}
diff --git a/application/models/content/Veranstaltungskategorie_model.php b/application/models/content/Veranstaltungskategorie_model.php
deleted file mode 100644
index 85d069735..000000000
--- a/application/models/content/Veranstaltungskategorie_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Veranstaltungskategorie_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'campus.tbl_veranstaltungskategorie';
-		$this->pk = 'veranstaltungskategorie_kurzbz';
-	}
-}
diff --git a/application/models/crm/Aufnahmeschluessel_model.php b/application/models/crm/Aufnahmeschluessel_model.php
deleted file mode 100644
index df74791bb..000000000
--- a/application/models/crm/Aufnahmeschluessel_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Aufnahmeschluessel_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_aufnahmeschluessel';
-		$this->pk = 'aufnahmeschluessel';
-	}
-}
diff --git a/application/models/crm/Bewerbungstermine_model.php b/application/models/crm/Bewerbungstermine_model.php
deleted file mode 100644
index 74326a702..000000000
--- a/application/models/crm/Bewerbungstermine_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Bewerbungstermine_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_bewerbungstermine';
-		$this->pk = 'bewerbungstermin_id';
-	}
-}
diff --git a/application/models/crm/Buchungstyp_model.php b/application/models/crm/Buchungstyp_model.php
deleted file mode 100644
index f06e45eb2..000000000
--- a/application/models/crm/Buchungstyp_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Buchungstyp_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_buchungstyp';
-		$this->pk = 'buchungstyp_kurzbz';
-	}
-}
diff --git a/application/models/crm/Dokument_model.php b/application/models/crm/Dokument_model.php
deleted file mode 100644
index 7ef2be716..000000000
--- a/application/models/crm/Dokument_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Dokument_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_dokument';
-		$this->pk = 'dokument_kurzbz';
-	}
-}
diff --git a/application/models/crm/Dokumentprestudent_model.php b/application/models/crm/Dokumentprestudent_model.php
deleted file mode 100644
index ab4764479..000000000
--- a/application/models/crm/Dokumentprestudent_model.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-class Dokumentprestudent_model extends DB_Model
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_dokumentprestudent';
-		$this->pk = array('prestudent_id', 'dokument_kurzbz');
-	}
-
-	/**
-	 * setAccepted
-	 */
-	public function setAccepted($prestudent_id, $studiengang_kz)
-	{
-		$result = null;
-
-		if (is_numeric($prestudent_id) && is_numeric($studiengang_kz))
-		{
-			$query = 'INSERT INTO public.tbl_dokumentprestudent (dokument_kurzbz, prestudent_id, insertamum) (
-					SELECT ds.dokument_kurzbz,
-							p.prestudent_id,
-							NOW() AS insertamum
-						FROM (SELECT DISTINCT person_id, dokument_kurzbz FROM public.tbl_akte) a
-				INNER JOIN public.tbl_prestudent p USING(person_id)
-				INNER JOIN public.tbl_dokumentstudiengang ds USING(dokument_kurzbz, studiengang_kz)
-				LEFT JOIN public.tbl_dokumentprestudent dp USING(dokument_kurzbz, prestudent_id)
-					WHERE ds.onlinebewerbung IS TRUE
-						AND (dp.dokument_kurzbz IS NULL AND dp.prestudent_id IS NULL)
-						AND p.prestudent_id = ?
-						AND ds.studiengang_kz = ?
-					)';
-
-			$result = $this->execQuery($query, array($prestudent_id, $studiengang_kz));
-		}
-
-		return $result;
-	}
-
-	/**
-	 * setAcceptedDocuments
-	 */
-	public function setAcceptedDocuments($prestudent_id, $dokument_kurzbz)
-	{
-		$result = null;
-
-		if (is_numeric($prestudent_id) && is_array($dokument_kurzbz) && count($dokument_kurzbz) > 0)
-		{
-			$query = 'INSERT INTO public.tbl_dokumentprestudent (dokument_kurzbz, prestudent_id, insertamum) (
-						SELECT d.dokument_kurzbz,
-								? AS prestudent_id,
-								NOW() AS insertamum
-						  FROM public.tbl_dokument d
-				 		 WHERE d.dokument_kurzbz IN ?
-						   AND d.dokument_kurzbz NOT IN (
-								SELECT dokument_kurzbz
-								  FROM public.tbl_dokumentprestudent
-								 WHERE prestudent_id = ?
-							)
-					)';
-
-			$result = $this->execQuery($query, array($prestudent_id, $dokument_kurzbz, $prestudent_id));
-		}
-
-		return $result;
-	}
-}
diff --git a/application/models/crm/Konto_model.php b/application/models/crm/Konto_model.php
deleted file mode 100644
index 286d3189e..000000000
--- a/application/models/crm/Konto_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Konto_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_konto';
-		$this->pk = 'buchungsnr';
-	}
-}
diff --git a/application/models/crm/Preincoming_model.php b/application/models/crm/Preincoming_model.php
deleted file mode 100644
index f9906781f..000000000
--- a/application/models/crm/Preincoming_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Preincoming_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_preincoming';
-		$this->pk = 'preincoming_id';
-	}
-}
diff --git a/application/models/crm/Preinteressent_model.php b/application/models/crm/Preinteressent_model.php
deleted file mode 100644
index bfc2a8afa..000000000
--- a/application/models/crm/Preinteressent_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Preinteressent_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_preinteressent';
-		$this->pk = 'preinteressent_id';
-	}
-}
diff --git a/application/models/crm/Preinteressentstudiengang_model.php b/application/models/crm/Preinteressentstudiengang_model.php
deleted file mode 100644
index 4ed665840..000000000
--- a/application/models/crm/Preinteressentstudiengang_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Preinteressentstudiengang_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_preinteressentstudiengang';
-		$this->pk = array('preinteressent_id', 'studiengang_kz');
-	}
-}
diff --git a/application/models/crm/Preoutgoing_model.php b/application/models/crm/Preoutgoing_model.php
deleted file mode 100644
index e9e8e76fd..000000000
--- a/application/models/crm/Preoutgoing_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Preoutgoing_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_preoutgoing';
-		$this->pk = 'preoutgoing_id';
-	}
-}
diff --git a/application/models/crm/Student_model.php b/application/models/crm/Student_model.php
deleted file mode 100644
index 532658208..000000000
--- a/application/models/crm/Student_model.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-class Student_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_student';
-		$this->pk = array('student_uid');
-		$this->hasSequence = false;
-	}
-
-	// ****
-	// * Generiert die Matrikelnummer
-	// * FORMAT: 0710254001
-	// * 07 = Jahr
-	// * 1/2/0  = WS/SS/incoming
-	// * 0254 = Studiengangskennzahl vierstellig
-	// * 001 = Laufende Nummer
-	// ****
-	public function generateMatrikelnummer($studiengang_kz, $studiensemester_kurzbz)
-	{
-		$jahr = mb_substr($studiensemester_kurzbz, 4);
-		$sem = mb_substr($studiensemester_kurzbz, 0, 2);
-		if ($sem == 'SS')
-			$jahr = $jahr - 1;
-		$art = 0;
-
-		$matrikelnummer = sprintf("%02d", $jahr).$art.sprintf("%04d", $studiengang_kz);
-
-		$qry = "SELECT matrikelnr FROM public.tbl_student WHERE matrikelnr LIKE ? ORDER BY matrikelnr DESC LIMIT 1";
-
-		$matrikelnrres = $this->execQuery($qry, array($matrikelnummer.'%'));
-
-		if (hasData($matrikelnrres))
-		{
-			$max = mb_substr($matrikelnrres->retval[0]->matrikelnr, 7);
-		}
-		else
-			$max = 0;
-
-		$max += 1;
-		return $matrikelnummer.sprintf("%03d", $max);
-	}
-}
diff --git a/application/models/education/Uebung_model.php b/application/models/education/Uebung_model.php
deleted file mode 100644
index 199328225..000000000
--- a/application/models/education/Uebung_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Uebung_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'campus.tbl_uebung';
-		$this->pk = 'uebung_id';
-	}
-}
diff --git a/application/models/organisation/Erhalter_model.php b/application/models/organisation/Erhalter_model.php
deleted file mode 100644
index 607d9ccd9..000000000
--- a/application/models/organisation/Erhalter_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Erhalter_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_erhalter';
-		$this->pk = 'erhalter_kz';
-	}
-}
diff --git a/application/models/organisation/Fachbereich_model.php b/application/models/organisation/Fachbereich_model.php
deleted file mode 100644
index e69565364..000000000
--- a/application/models/organisation/Fachbereich_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Fachbereich_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_fachbereich';
-		$this->pk = 'fachbereich_kurzbz';
-	}
-}
diff --git a/application/models/organisation/Ferien_model.php b/application/models/organisation/Ferien_model.php
deleted file mode 100644
index 2ade75aa4..000000000
--- a/application/models/organisation/Ferien_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Ferien_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_ferien';
-		$this->pk = array('studiengang_kz', 'bezeichnung');
-	}
-}
diff --git a/application/models/organisation/Lehrverband_model.php b/application/models/organisation/Lehrverband_model.php
deleted file mode 100644
index 953e4b7b2..000000000
--- a/application/models/organisation/Lehrverband_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Lehrverband_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_lehrverband';
-		$this->pk = array('gruppe', 'verband', 'semester', 'studiengang_kz');
-	}
-}
diff --git a/application/models/organisation/Organisationseinheittyp_model.php b/application/models/organisation/Organisationseinheittyp_model.php
deleted file mode 100644
index 6355758b6..000000000
--- a/application/models/organisation/Organisationseinheittyp_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Organisationseinheittyp_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_organisationseinheittyp';
-		$this->pk = 'organisationseinheittyp_kurzbz';
-	}
-}
diff --git a/application/models/organisation/Semesterwochen_model.php b/application/models/organisation/Semesterwochen_model.php
deleted file mode 100644
index 32666804d..000000000
--- a/application/models/organisation/Semesterwochen_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Semesterwochen_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_semesterwochen';
-		$this->pk = array('studiengang_kz', 'semester');
-	}
-}
diff --git a/application/models/organisation/Service_model.php b/application/models/organisation/Service_model.php
deleted file mode 100644
index 5f692e707..000000000
--- a/application/models/organisation/Service_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Service_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_service';
-		$this->pk = 'service_id';
-	}
-}
diff --git a/application/models/organisation/Standort_model.php b/application/models/organisation/Standort_model.php
deleted file mode 100644
index 382236e2f..000000000
--- a/application/models/organisation/Standort_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Standort_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_standort';
-		$this->pk = 'standort_id';
-	}
-}
diff --git a/application/models/organisation/Statistik_model.php b/application/models/organisation/Statistik_model.php
deleted file mode 100644
index b72ac0577..000000000
--- a/application/models/organisation/Statistik_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Statistik_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_statistik';
-		$this->pk = 'statistik_kurzbz';
-	}
-}
diff --git a/application/models/organisation/Studiengangstyp_model.php b/application/models/organisation/Studiengangstyp_model.php
deleted file mode 100644
index 9a6b5df22..000000000
--- a/application/models/organisation/Studiengangstyp_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Studiengangstyp_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_studiengangstyp';
-		$this->pk = 'typ';
-	}
-}
diff --git a/application/models/organisation/Studienordnung_model.php b/application/models/organisation/Studienordnung_model.php
deleted file mode 100644
index fc2e28d4b..000000000
--- a/application/models/organisation/Studienordnung_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Studienordnung_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_studienordnung';
-		$this->pk = 'studienordnung_id';
-	}
-}
diff --git a/application/models/organisation/Studienordnungstatus_model.php b/application/models/organisation/Studienordnungstatus_model.php
deleted file mode 100644
index 8b6417ab1..000000000
--- a/application/models/organisation/Studienordnungstatus_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Studienordnungstatus_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_studienordnungstatus';
-		$this->pk = 'status_kurzbz';
-	}
-}
diff --git a/application/models/organisation/Studienplatz_model.php b/application/models/organisation/Studienplatz_model.php
deleted file mode 100644
index 7bfd8b13b..000000000
--- a/application/models/organisation/Studienplatz_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Studienplatz_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_studienplatz';
-		$this->pk = 'studienplatz_id';
-	}
-}
diff --git a/application/models/person/Bankverbindung_model.php b/application/models/person/Bankverbindung_model.php
deleted file mode 100644
index 193aad257..000000000
--- a/application/models/person/Bankverbindung_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Bankverbindung_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_bankverbindung';
-		$this->pk = 'bankverbindung_id';
-	}
-}
diff --git a/application/models/person/Benutzergruppe_model.php b/application/models/person/Benutzergruppe_model.php
deleted file mode 100644
index e569094c4..000000000
--- a/application/models/person/Benutzergruppe_model.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-class Benutzergruppe_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_benutzergruppe';
-		$this->pk = array('gruppe_kurzbz', 'uid');
-		$this->hasSequence = false;
-	}
-}
diff --git a/application/models/person/Fotostatus_model.php b/application/models/person/Fotostatus_model.php
deleted file mode 100644
index eb2b43e51..000000000
--- a/application/models/person/Fotostatus_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Fotostatus_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_fotostatus';
-		$this->pk = 'fotostatus_kurzbz';
-	}
-}
diff --git a/application/models/person/Freebusy_model.php b/application/models/person/Freebusy_model.php
deleted file mode 100644
index 01969dfc1..000000000
--- a/application/models/person/Freebusy_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Freebusy_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'campus.tbl_freebusy';
-		$this->pk = 'freebusy_id';
-	}
-}
diff --git a/application/models/person/Freebusytyp_model.php b/application/models/person/Freebusytyp_model.php
deleted file mode 100644
index d5207850c..000000000
--- a/application/models/person/Freebusytyp_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Freebusytyp_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'campus.tbl_freebusytyp';
-		$this->pk = 'freebusytyp_kurzbz';
-	}
-}
diff --git a/application/models/person/Kontaktmedium_model.php b/application/models/person/Kontaktmedium_model.php
deleted file mode 100644
index cc330ddd7..000000000
--- a/application/models/person/Kontaktmedium_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Kontaktmedium_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_kontaktmedium';
-		$this->pk = 'kontaktmedium_kurzbz';
-	}
-}
diff --git a/application/models/person/Kontakttyp_model.php b/application/models/person/Kontakttyp_model.php
deleted file mode 100644
index d32cded13..000000000
--- a/application/models/person/Kontakttyp_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Kontakttyp_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_kontakttyp';
-		$this->pk = 'kontakttyp';
-	}
-}
diff --git a/application/models/person/Notizzuordnung_model.php b/application/models/person/Notizzuordnung_model.php
deleted file mode 100644
index 187a8399b..000000000
--- a/application/models/person/Notizzuordnung_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Notizzuordnung_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_notizzuordnung';
-		$this->pk = 'notizzuordnung_id';
-	}
-}
diff --git a/application/models/project/Aktivitaet_model.php b/application/models/project/Aktivitaet_model.php
deleted file mode 100644
index 529040aa3..000000000
--- a/application/models/project/Aktivitaet_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Aktivitaet_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'fue.tbl_aktivitaet';
-		$this->pk = 'aktivitaet_kurzbz';
-	}
-}
diff --git a/application/models/project/Aufwandstyp_model.php b/application/models/project/Aufwandstyp_model.php
deleted file mode 100644
index 2f20600ce..000000000
--- a/application/models/project/Aufwandstyp_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Aufwandstyp_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'fue.tbl_aufwandstyp';
-		$this->pk = 'aufwandstyp_kurzbz';
-	}
-}
diff --git a/application/models/project/Projekt_ressource_model.php b/application/models/project/Projekt_ressource_model.php
deleted file mode 100644
index d641556fd..000000000
--- a/application/models/project/Projekt_ressource_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Projekt_ressource_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'fue.tbl_projekt_ressource';
-		$this->pk = 'projekt_ressource_id';
-	}
-}
diff --git a/application/models/project/Projektphase_model.php b/application/models/project/Projektphase_model.php
deleted file mode 100644
index 4980ed64b..000000000
--- a/application/models/project/Projektphase_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Projektphase_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'fue.tbl_projektphase';
-		$this->pk = 'projektphase_id';
-	}
-}
diff --git a/application/models/project/Projekttask_model.php b/application/models/project/Projekttask_model.php
deleted file mode 100644
index 64ea94089..000000000
--- a/application/models/project/Projekttask_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Projekttask_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'fue.tbl_projekttask';
-		$this->pk = 'projekttask_id';
-	}
-}
diff --git a/application/models/project/Ressource_model.php b/application/models/project/Ressource_model.php
deleted file mode 100644
index 35eb4eb97..000000000
--- a/application/models/project/Ressource_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Ressource_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'fue.tbl_ressource';
-		$this->pk = 'ressource_id';
-	}
-}
diff --git a/application/models/project/Scrumsprint_model.php b/application/models/project/Scrumsprint_model.php
deleted file mode 100644
index c2c8a60a1..000000000
--- a/application/models/project/Scrumsprint_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Scrumsprint_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'fue.tbl_scrumsprint';
-		$this->pk = 'scrumsprint_id';
-	}
-}
diff --git a/application/models/ressource/Betriebsmittel_model.php b/application/models/ressource/Betriebsmittel_model.php
deleted file mode 100644
index 849a9199f..000000000
--- a/application/models/ressource/Betriebsmittel_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Betriebsmittel_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'wawi.tbl_betriebsmittel';
-		$this->pk = 'betriebsmittel_id';
-	}
-}
diff --git a/application/models/ressource/Betriebsmittelperson_model.php b/application/models/ressource/Betriebsmittelperson_model.php
deleted file mode 100644
index 924f670e0..000000000
--- a/application/models/ressource/Betriebsmittelperson_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Betriebsmittelperson_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'wawi.tbl_betriebsmittelperson';
-		$this->pk = 'betriebsmittelperson_id';
-	}
-}
diff --git a/application/models/ressource/Betriebsmittelstatus_model.php b/application/models/ressource/Betriebsmittelstatus_model.php
deleted file mode 100644
index 7b4f70c59..000000000
--- a/application/models/ressource/Betriebsmittelstatus_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Betriebsmittelstatus_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'wawi.tbl_betriebsmittelstatus';
-		$this->pk = 'betriebsmittelstatus_kurzbz';
-	}
-}
diff --git a/application/models/ressource/Betriebsmitteltyp_model.php b/application/models/ressource/Betriebsmitteltyp_model.php
deleted file mode 100644
index 23bec97a8..000000000
--- a/application/models/ressource/Betriebsmitteltyp_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Betriebsmitteltyp_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'wawi.tbl_betriebsmitteltyp';
-		$this->pk = 'betriebsmitteltyp';
-	}
-}
diff --git a/application/models/ressource/Coodle_model.php b/application/models/ressource/Coodle_model.php
deleted file mode 100644
index 1382bf7a0..000000000
--- a/application/models/ressource/Coodle_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Coodle_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'campus.tbl_coodle';
-		$this->pk = 'coodle_id';
-	}
-}
diff --git a/application/models/ressource/Erreichbarkeit_model.php b/application/models/ressource/Erreichbarkeit_model.php
deleted file mode 100644
index b16b1614f..000000000
--- a/application/models/ressource/Erreichbarkeit_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Erreichbarkeit_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'campus.tbl_erreichbarkeit';
-		$this->pk = 'erreichbarkeit_kurzbz';
-	}
-}
diff --git a/application/models/ressource/Firma_model.php b/application/models/ressource/Firma_model.php
deleted file mode 100644
index 1b8dfb51d..000000000
--- a/application/models/ressource/Firma_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Firma_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_firma';
-		$this->pk = 'firma_id';
-	}
-}
diff --git a/application/models/ressource/Firmatag_model.php b/application/models/ressource/Firmatag_model.php
deleted file mode 100644
index 582ea0679..000000000
--- a/application/models/ressource/Firmatag_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Firmatag_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_firmatag';
-		$this->pk = array('tag', 'firma_id');
-	}
-}
diff --git a/application/models/ressource/Firmentyp_model.php b/application/models/ressource/Firmentyp_model.php
deleted file mode 100644
index a9aa93705..000000000
--- a/application/models/ressource/Firmentyp_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Firmentyp_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_firmentyp';
-		$this->pk = 'firmentyp_kurzbz';
-	}
-}
diff --git a/application/models/ressource/Funktion_model.php b/application/models/ressource/Funktion_model.php
deleted file mode 100644
index 43908167c..000000000
--- a/application/models/ressource/Funktion_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Funktion_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_funktion';
-		$this->pk = 'funktion_kurzbz';
-	}
-}
diff --git a/application/models/ressource/Lehrmittel_model.php b/application/models/ressource/Lehrmittel_model.php
deleted file mode 100644
index b21e91764..000000000
--- a/application/models/ressource/Lehrmittel_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Lehrmittel_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_lehrmittel';
-		$this->pk = 'lehrmittel_kurzbz';
-	}
-}
diff --git a/application/models/ressource/Mitarbeiter_model.php b/application/models/ressource/Mitarbeiter_model.php
deleted file mode 100644
index 1e03a0ecd..000000000
--- a/application/models/ressource/Mitarbeiter_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Mitarbeiter_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_mitarbeiter';
-		$this->pk = 'mitarbeiter_uid';
-	}
-}
diff --git a/application/models/ressource/Ort_model.php b/application/models/ressource/Ort_model.php
deleted file mode 100644
index 59b213a54..000000000
--- a/application/models/ressource/Ort_model.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-class Ort_model extends DB_Model
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = "public.tbl_ort";
-		$this->pk = "ort_kurzbz";
-	}
-	
-	public function getAll($raumtyp_kurzbz)
-	{
-		$this->addOrder("ort_kurzbz");
-		
-		$this->addJoin("public.tbl_ortraumtyp", "ort_kurzbz");
-		
-		return $this->OrtModel->loadWhere(array("raumtyp_kurzbz" => $raumtyp_kurzbz));
-	}
-}
\ No newline at end of file
diff --git a/application/models/ressource/Ortraumtyp_model.php b/application/models/ressource/Ortraumtyp_model.php
deleted file mode 100644
index af0d3cb09..000000000
--- a/application/models/ressource/Ortraumtyp_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Ortraumtyp_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_ortraumtyp';
-		$this->pk = array('hierarchie', 'ort_kurzbz');
-	}
-}
diff --git a/application/models/ressource/Personfunktionstandort_model.php b/application/models/ressource/Personfunktionstandort_model.php
deleted file mode 100644
index addbb760a..000000000
--- a/application/models/ressource/Personfunktionstandort_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Personfunktionstandort_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_personfunktionstandort';
-		$this->pk = 'personfunktionstandort_id';
-	}
-}
diff --git a/application/models/ressource/Raumtyp_model.php b/application/models/ressource/Raumtyp_model.php
deleted file mode 100644
index afc8a7cc3..000000000
--- a/application/models/ressource/Raumtyp_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Raumtyp_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_raumtyp';
-		$this->pk = 'raumtyp_kurzbz';
-	}
-}
diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php
deleted file mode 100644
index 37d0cb376..000000000
--- a/application/models/ressource/Reservierung_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Reservierung_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'campus.tbl_reservierung';
-		$this->pk = 'reservierung_id';
-	}
-}
diff --git a/application/models/ressource/Stunde_model.php b/application/models/ressource/Stunde_model.php
deleted file mode 100644
index 05a9cddff..000000000
--- a/application/models/ressource/Stunde_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Stunde_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_stunde';
-		$this->pk = 'stunde';
-	}
-}
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
deleted file mode 100644
index be3d520b5..000000000
--- a/application/models/ressource/Stundenplan_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Stundenplan_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_stundenplan';
-		$this->pk = 'stundenplan_id';
-	}
-}
diff --git a/application/models/ressource/Zeitaufzeichnung_model.php b/application/models/ressource/Zeitaufzeichnung_model.php
deleted file mode 100644
index f887a20a0..000000000
--- a/application/models/ressource/Zeitaufzeichnung_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Zeitaufzeichnung_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'campus.tbl_zeitaufzeichnung';
-		$this->pk = 'zeitaufzeichnung_id';
-	}
-}
diff --git a/application/models/ressource/Zeitsperre_model.php b/application/models/ressource/Zeitsperre_model.php
deleted file mode 100644
index 07889e349..000000000
--- a/application/models/ressource/Zeitsperre_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Zeitsperre_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'campus.tbl_zeitsperre';
-		$this->pk = 'zeitsperre_id';
-	}
-}
diff --git a/application/models/ressource/Zeitsperretyp_model.php b/application/models/ressource/Zeitsperretyp_model.php
deleted file mode 100644
index ef54571e8..000000000
--- a/application/models/ressource/Zeitsperretyp_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Zeitsperretyp_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'campus.tbl_zeitsperretyp';
-		$this->pk = 'zeitsperretyp_kurzbz';
-	}
-}
diff --git a/application/models/ressource/Zeitwunsch_model.php b/application/models/ressource/Zeitwunsch_model.php
deleted file mode 100644
index ea2ec698a..000000000
--- a/application/models/ressource/Zeitwunsch_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Zeitwunsch_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'campus.tbl_zeitwunsch';
-		$this->pk = array('tag', 'mitarbeiter_uid', 'stunde');
-	}
-}
diff --git a/application/models/system/App_model.php b/application/models/system/App_model.php
deleted file mode 100644
index e0fd19c75..000000000
--- a/application/models/system/App_model.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-class App_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'system.tbl_app';
-		$this->pk = 'app';
-	}
-
-}
diff --git a/application/models/system/Berechtigung_model.php b/application/models/system/Berechtigung_model.php
deleted file mode 100644
index 9bd572614..000000000
--- a/application/models/system/Berechtigung_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Berechtigung_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'system.tbl_berechtigung';
-		$this->pk = 'berechtigung_kurzbz';
-	}
-}
diff --git a/application/models/system/Cronjob_model.php b/application/models/system/Cronjob_model.php
deleted file mode 100644
index e47ea5bef..000000000
--- a/application/models/system/Cronjob_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Cronjob_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'system.tbl_cronjob';
-		$this->pk = 'cronjob_id';
-	}
-}
diff --git a/application/models/system/Filter_model.php b/application/models/system/Filter_model.php
deleted file mode 100644
index 5d44e0052..000000000
--- a/application/models/system/Filter_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Filter_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_filter';
-		$this->pk = 'filter_id';
-	}
-}
diff --git a/application/models/system/Log_model.php b/application/models/system/Log_model.php
deleted file mode 100644
index 8b27f6c53..000000000
--- a/application/models/system/Log_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Log_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_log';
-		$this->pk = 'log_id';
-	}
-}
diff --git a/application/models/system/PersonLock_model.php b/application/models/system/PersonLock_model.php
deleted file mode 100644
index 1d106b789..000000000
--- a/application/models/system/PersonLock_model.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-/**
- * Enables content locking.
- * An entry in the locktable means certain content is marked locked and a user is its editor.
- */
-class PersonLock_model extends DB_Model
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'system.tbl_person_lock';
-		$this->pk = 'lock_id';
-	}
-
-	/**
-	 * Checks if a specific person is locked. By default, looks for entries with no app in locktable for the person.
-	 * Alternatively, looks only for locks in a certain app.
-	 * @param $person_id
-	 * @param null $app
-	 * @return array all locks for a person if locked, null otherwise
-	 */
-	public function checkIfLocked($person_id, $app = null)
-	{
-		$lockdata = array('person_id' => $person_id, 'app' => $app);
-
-		$result = $this->loadWhere($lockdata);
-
-		if ($result->error)
-			return error($result->retval);
-
-		if (count($result->retval) > 0)
-			return success($result->retval);
-		else
-			return success(null);
-	}
-
-	/**
-	 * Locks a person. Returns null if person was not locked (e.g. when already locked).
-	 * @param $person_id
-	 * @param $uid user who locks the person
-	 * @param $app optional, application in which person is locked
-	 * @return array inserted lock id if person was locked, null otherwise
-	 */
-	public function lockPerson($person_id, $uid, $app = null)
-	{
-		$locked = $this->checkIfLocked($person_id, $app);
-
-		if ($locked->error)
-			return error($locked->retval);
-
-		//insert only if not already locked
-		if ($locked->retval === null)
-			return $this->insert(array('person_id' => $person_id, 'uid' => $uid, 'app' => $app));
-		else
-			return success(null);
-	}
-
-	/**
-	 * Remove a lock for a person. By default, removes any entries in locktable for the person.
-	 * Alternatively, removes only locks in a certain app.
-	 * @param $person_id
-	 * @param null $app
-	 * @return array deleted lock ids if person was locked, null otherwise
-	 */
-	public function unlockPerson($person_id, $app = null)
-	{
-		$deleted = array();
-		$locks = $this->checkIfLocked($person_id, $app);
-
-		if ($locks->retval === null)
-			return success(null);
-
-		foreach ($locks->retval as $lock)
-		{
-			$result = $this->delete($lock->lock_id);
-			if ($result->error)
-				return error($result->retval);
-
-			$deleted[] = $lock;
-		}
-
-		return success($deleted);
-	}
-}
diff --git a/application/models/system/Rolle_model.php b/application/models/system/Rolle_model.php
deleted file mode 100644
index 5ba085853..000000000
--- a/application/models/system/Rolle_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Rolle_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'system.tbl_rolle';
-		$this->pk = 'rolle_kurzbz';
-	}
-}
diff --git a/application/models/system/Rolleberechtigung_model.php b/application/models/system/Rolleberechtigung_model.php
deleted file mode 100644
index 0b08da1ca..000000000
--- a/application/models/system/Rolleberechtigung_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Rolleberechtigung_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'system.tbl_rolleberechtigung';
-		$this->pk = array('rolle_kurzbz', 'berechtigung_kurzbz');
-	}
-}
diff --git a/application/models/system/Server_model.php b/application/models/system/Server_model.php
deleted file mode 100644
index 4521e1fd4..000000000
--- a/application/models/system/Server_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Server_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'system.tbl_server';
-		$this->pk = 'server_kurzbz';
-	}
-}
\ No newline at end of file
diff --git a/application/models/system/Tag_model.php b/application/models/system/Tag_model.php
deleted file mode 100644
index 94434da45..000000000
--- a/application/models/system/Tag_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Tag_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_tag';
-		$this->pk = 'tag';
-	}
-}
diff --git a/application/models/system/Variable_model.php b/application/models/system/Variable_model.php
deleted file mode 100644
index 9800999fe..000000000
--- a/application/models/system/Variable_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Variable_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_variable';
-		$this->pk = array('uid', 'name');
-	}
-}
diff --git a/application/models/system/Webservicelog_model.php b/application/models/system/Webservicelog_model.php
deleted file mode 100644
index dc45b13a7..000000000
--- a/application/models/system/Webservicelog_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Webservicelog_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'system.tbl_webservicelog';
-		$this->pk = 'webservicelog_id';
-	}
-}
diff --git a/application/models/system/Webservicerecht_model.php b/application/models/system/Webservicerecht_model.php
deleted file mode 100644
index a5bd036f0..000000000
--- a/application/models/system/Webservicerecht_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Webservicerecht_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'system.tbl_webservicerecht';
-		$this->pk = 'webservicerecht_id';
-	}
-}
diff --git a/application/models/system/Webservicetyp_model.php b/application/models/system/Webservicetyp_model.php
deleted file mode 100644
index 5d989de2a..000000000
--- a/application/models/system/Webservicetyp_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Webservicetyp_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'system.tbl_webservicetyp';
-		$this->pk = 'webservicetyp_kurzbz';
-	}
-}
diff --git a/application/models/testtool/Ablauf_model.php b/application/models/testtool/Ablauf_model.php
deleted file mode 100644
index 748926658..000000000
--- a/application/models/testtool/Ablauf_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Ablauf_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'testtool.tbl_ablauf';
-		$this->pk = 'ablauf_id';
-	}
-}
diff --git a/application/models/testtool/Antwort_model.php b/application/models/testtool/Antwort_model.php
deleted file mode 100644
index 1594be6c3..000000000
--- a/application/models/testtool/Antwort_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Antwort_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'testtool.tbl_antwort';
-		$this->pk = 'antwort_id';
-	}
-}
diff --git a/application/models/testtool/Frage_model.php b/application/models/testtool/Frage_model.php
deleted file mode 100644
index de64c303b..000000000
--- a/application/models/testtool/Frage_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Frage_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'testtool.tbl_frage';
-		$this->pk = 'frage_id';
-	}
-}
diff --git a/application/models/testtool/Gebiet_model.php b/application/models/testtool/Gebiet_model.php
deleted file mode 100644
index 202d6a4aa..000000000
--- a/application/models/testtool/Gebiet_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Gebiet_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'testtool.tbl_gebiet';
-		$this->pk = 'gebiet_id';
-	}
-}
diff --git a/application/models/testtool/Kategorie_model.php b/application/models/testtool/Kategorie_model.php
deleted file mode 100644
index 10e450651..000000000
--- a/application/models/testtool/Kategorie_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Kategorie_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'testtool.tbl_kategorie';
-		$this->pk = 'kategorie_kurzbz';
-	}
-}
diff --git a/application/models/testtool/Kriterien_model.php b/application/models/testtool/Kriterien_model.php
deleted file mode 100644
index 83d0fb97c..000000000
--- a/application/models/testtool/Kriterien_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Kriterien_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'testtool.tbl_kriterien';
-		$this->pk = 'kategorie_kurzbz';
-	}
-}
diff --git a/application/models/testtool/Pruefling_model.php b/application/models/testtool/Pruefling_model.php
deleted file mode 100644
index da131ba4a..000000000
--- a/application/models/testtool/Pruefling_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Pruefling_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'testtool.tbl_pruefling';
-		$this->pk = 'pruefling_id';
-	}
-}
diff --git a/application/models/testtool/Vorschlag_model.php b/application/models/testtool/Vorschlag_model.php
deleted file mode 100644
index 853852da2..000000000
--- a/application/models/testtool/Vorschlag_model.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Vorschlag_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'testtool.tbl_vorschlag';
-		$this->pk = 'vorschlag_id';
-	}
-}