diff --git a/schema/ofm/ammendments.sql b/schema/ofm/ammendments.sql
index 01864b2..cdff7a8 100644
--- a/schema/ofm/ammendments.sql
+++ b/schema/ofm/ammendments.sql
@@ -1,18 +1,3 @@
---
--- Table structure for table `AMMNT_ACTIVITYDATARECORDER`
---
-
-CREATE TABLE `AMMNT_ACTIVITYDATARECORDER` (
-  `PK` int(11) NOT NULL AUTO_INCREMENT,
-  `userId` int(11) NOT NULL,
-  `record` longtext,
-  `timestamp` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  `LoginTime` timestamp NULL DEFAULT NULL,
-  `LogoutTime` timestamp NULL DEFAULT NULL,
-  `ActivityDurationMin` int(11) DEFAULT '0',
-  PRIMARY KEY (`PK`)
-) ENGINE=InnoDB AUTO_INCREMENT=4614 DEFAULT CHARSET=utf8;
-
 --
 -- Table structure for table `AMMNT_COMMIT`
 --
diff --git a/schema/ofm/debug.sql b/schema/ofm/debug.sql
deleted file mode 100644
index 4838168..0000000
--- a/schema/ofm/debug.sql
+++ /dev/null
@@ -1,9 +0,0 @@
---
--- Table structure for table `DEBUG`
---
-
-CREATE TABLE `DEBUG` (
-  `output` varchar(100) NOT NULL,
-  `pk` int(11) NOT NULL AUTO_INCREMENT,
-  PRIMARY KEY (`pk`)
-) ENGINE=MyISAM AUTO_INCREMENT=8 DEFAULT CHARSET=utf8;
diff --git a/schema/ofm/languages.sql b/schema/ofm/languages.sql
deleted file mode 100644
index d59af2c..0000000
--- a/schema/ofm/languages.sql
+++ /dev/null
@@ -1,95 +0,0 @@
---
--- Table structure for table `G1T`
---
-
-CREATE TABLE `G1T` (
-  `LanguageID` int(11) NOT NULL AUTO_INCREMENT,
-  `LanguageDescription` varchar(50) NOT NULL,
-  `LanguageDescriptionIcon` int(11) DEFAULT NULL,
-  `TextID` int(11) NOT NULL,
-  PRIMARY KEY (`LanguageID`),
-  KEY `index1` (`LanguageID`,`LanguageDescription`,`LanguageDescriptionIcon`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `G2T`
---
-
-CREATE TABLE `G2T` (
-  `CountryID` int(11) NOT NULL AUTO_INCREMENT,
-  `CountryDescription` varchar(200) NOT NULL,
-  `CountryDescriptionIcon` int(11) DEFAULT NULL,
-  `TextID` int(11) NOT NULL,
-  PRIMARY KEY (`CountryID`),
-  KEY `index1` (`CountryID`,`CountryDescription`,`CountryDescriptionIcon`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `G4A1`
---
-
-CREATE TABLE `G4A1` (
-  `PK` int(11) NOT NULL AUTO_INCREMENT,
-  `RefID` int(11) NOT NULL,
-  `LanguageID` int(11) NOT NULL,
-  `Translation` varchar(10) NOT NULL,
-  PRIMARY KEY (`PK`)
-) ENGINE=MyISAM AUTO_INCREMENT=11 DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `G4A2`
---
-
-CREATE TABLE `G4A2` (
-  `PK` int(11) NOT NULL AUTO_INCREMENT,
-  `RefID` int(11) NOT NULL,
-  `LanguageID` int(11) NOT NULL,
-  `Translation` varchar(50) NOT NULL,
-  PRIMARY KEY (`PK`)
-) ENGINE=MyISAM AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `G4A3`
---
-
-CREATE TABLE `G4A3` (
-  `PK` int(11) NOT NULL AUTO_INCREMENT,
-  `RefID` int(11) NOT NULL,
-  `LanguageID` int(11) NOT NULL,
-  `Translation` varchar(200) NOT NULL,
-  PRIMARY KEY (`PK`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `G4A4`
---
-
-CREATE TABLE `G4A4` (
-  `PK` int(11) NOT NULL AUTO_INCREMENT,
-  `RefID` int(11) NOT NULL,
-  `LanguageID` int(11) NOT NULL,
-  `Translation` varchar(1000) NOT NULL,
-  PRIMARY KEY (`PK`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `G4T`
---
-
-CREATE TABLE `G4T` (
-  `SystemID` int(11) NOT NULL AUTO_INCREMENT,
-  `SystemTextKey` varchar(100) NOT NULL,
-  `Format` int(11) NOT NULL,
-  PRIMARY KEY (`SystemID`)
-) ENGINE=MyISAM AUTO_INCREMENT=533 DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `G5T`
---
-
-CREATE TABLE `G5T` (
-  `SystemsIconsID` int(11) NOT NULL AUTO_INCREMENT,
-  `Icon` blob NOT NULL,
-  PRIMARY KEY (`SystemsIconsID`)
-) ENGINE=MyISAM AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
-
diff --git a/schema/ofm/organisations.sql b/schema/ofm/organisations.sql
index cec1f2a..7fa5a0f 100644
--- a/schema/ofm/organisations.sql
+++ b/schema/ofm/organisations.sql
@@ -7,8 +7,6 @@ CREATE TABLE `O1A1` (
   `OrganizationID` int(11) NOT NULL,
   `UserPropertiesTypeID` int(11) NOT NULL,
   `UserPropertiesTypeValue` float NOT NULL,
-  `Hidden` tinyint(1) NOT NULL,
-  `IonChangeTimestamp` datetime DEFAULT NULL,
   PRIMARY KEY (`Pk`),
   KEY `index1` (`OrganizationID`,`UserPropertiesTypeID`),
   KEY `index2` (`Hidden`)
@@ -23,8 +21,6 @@ CREATE TABLE `O1A2` (
   `OrganizationID` int(11) NOT NULL,
   `UserPropertiesTypeID` int(11) NOT NULL,
   `UserPropertiesTypeValue` int(11) NOT NULL,
-  `Hidden` tinyint(1) NOT NULL,
-  `IonChangeTimestamp` datetime DEFAULT NULL,
   PRIMARY KEY (`Pk`),
   KEY `index1` (`OrganizationID`,`UserPropertiesTypeID`),
   KEY `index2` (`Hidden`)
@@ -39,8 +35,6 @@ CREATE TABLE `O1A3` (
   `OrganizationID` int(11) NOT NULL,
   `UserPropertiesTypeID` int(11) NOT NULL,
   `UserPropertiesTypeValue` varchar(200) NOT NULL,
-  `Hidden` tinyint(1) NOT NULL,
-  `IonChangeTimestamp` datetime DEFAULT NULL,
   PRIMARY KEY (`Pk`),
   KEY `index1` (`UserPropertiesTypeID`,`OrganizationID`),
   KEY `index` (`Hidden`)
@@ -55,8 +49,6 @@ CREATE TABLE `O1A4` (
   `OrganizationID` int(11) NOT NULL,
   `UserPropertiesTypeID` int(11) NOT NULL,
   `UserPropertiesTypeValue` varchar(50) NOT NULL,
-  `Hidden` tinyint(1) NOT NULL,
-  `IonChangeTimestamp` datetime DEFAULT NULL,
   PRIMARY KEY (`Pk`),
   KEY `index1` (`OrganizationID`,`UserPropertiesTypeID`),
   KEY `index2` (`Hidden`)
@@ -71,8 +63,6 @@ CREATE TABLE `O1A5` (
   `OrganizationID` int(11) NOT NULL,
   `UserPropertiesTypeID` int(11) NOT NULL,
   `UserPropertiesTypeValue` datetime NOT NULL,
-  `Hidden` tinyint(1) NOT NULL,
-  `IonChangeTimestamp` datetime DEFAULT NULL,
   PRIMARY KEY (`Pk`),
   KEY `index1` (`OrganizationID`,`UserPropertiesTypeID`),
   KEY `index2` (`Hidden`)
@@ -87,8 +77,6 @@ CREATE TABLE `O1A6` (
   `OrganizationID` int(11) NOT NULL,
   `UserPropertiesTypeID` int(11) NOT NULL,
   `UserPropertiesTypeValue` longblob NOT NULL,
-  `Hidden` tinyint(1) NOT NULL,
-  `IonChangeTimestamp` datetime DEFAULT NULL,
   PRIMARY KEY (`PK`),
   KEY `index1` (`OrganizationID`,`UserPropertiesTypeID`),
   KEY `index2` (`Hidden`)
@@ -103,8 +91,6 @@ CREATE TABLE `O1A7` (
   `OrganizationID` int(11) NOT NULL,
   `UserPropertiesTypeID` int(11) NOT NULL,
   `UserPropertiesTypeValue` tinyint(1) NOT NULL,
-  `Hidden` tinyint(1) NOT NULL,
-  `IonChangeTimestamp` datetime DEFAULT NULL,
   PRIMARY KEY (`Pk`),
   KEY `index1` (`OrganizationID`,`UserPropertiesTypeID`),
   KEY `index2` (`Hidden`)
diff --git a/schema/ofm/permissions.sql b/schema/ofm/permissions.sql
index 3892839..15f1fc6 100644
--- a/schema/ofm/permissions.sql
+++ b/schema/ofm/permissions.sql
@@ -18,19 +18,6 @@ CREATE TABLE `P1A` (
   KEY `index5` (`PermissionEndValidity`)
 ) ENGINE=InnoDB AUTO_INCREMENT=977 DEFAULT CHARSET=utf8;
 
---
--- Table structure for table `P1L`
---
-
-CREATE TABLE `P1L` (
-  `PK` int(11) NOT NULL AUTO_INCREMENT,
-  `RefID` int(11) NOT NULL,
-  `LanguageID` int(11) NOT NULL,
-  `Translation` varchar(200) NOT NULL,
-  PRIMARY KEY (`PK`),
-  KEY `index1` (`RefID`,`LanguageID`,`Translation`)
-) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8;
-
 --
 -- Table structure for table `P1T`
 --
diff --git a/schema/ofm/services.sql b/schema/ofm/services.sql
index f343198..fad4d5d 100644
--- a/schema/ofm/services.sql
+++ b/schema/ofm/services.sql
@@ -1,15 +1,3 @@
---
--- Table structure for table `S1L`
---
-
-CREATE TABLE `S1L` (
-  `PK` int(11) NOT NULL AUTO_INCREMENT,
-  `RefID` int(11) NOT NULL,
-  `LanguageID` int(11) NOT NULL,
-  `Translation` varchar(100) NOT NULL,
-  PRIMARY KEY (`PK`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
 --
 -- Table structure for table `S1T`
 --
@@ -32,11 +20,8 @@ CREATE TABLE `S2A1` (
   `ServiceID` int(11) NOT NULL,
   `ServicePropertiesTypeID` int(11) NOT NULL,
   `ServicePropertiesTypeValue` double NOT NULL,
-  `IonChangeTimestamp` datetime NOT NULL,
-  `deleted` tinyint(4) DEFAULT NULL,
-  `ammnt_FirId` int(11) DEFAULT NULL,
   PRIMARY KEY (`PK`),
-  KEY `index2` (`ServiceID`,`ServicePropertiesTypeID`,`ammnt_FirId`)
+  KEY `index2` (`ServiceID`,`ServicePropertiesTypeID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 --
@@ -48,11 +33,8 @@ CREATE TABLE `S2A2` (
   `ServiceID` int(11) NOT NULL,
   `ServicePropertiesTypeID` int(11) NOT NULL,
   `ServicePropertiesTypeValue` tinyint(1) NOT NULL,
-  `IonChangeTimestamp` datetime NOT NULL,
-  `deleted` tinyint(4) DEFAULT NULL,
-  `ammnt_FirId` int(11) DEFAULT NULL,
   PRIMARY KEY (`PK`),
-  KEY `index1` (`ServiceID`,`ServicePropertiesTypeID`,`ammnt_FirId`)
+  KEY `index1` (`ServiceID`,`ServicePropertiesTypeID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 --
@@ -64,11 +46,8 @@ CREATE TABLE `S2A3` (
   `ServiceID` int(11) NOT NULL,
   `ServicePropertiesTypeID` int(11) NOT NULL,
   `ServicePropertiesTypeValue` varchar(50) NOT NULL,
-  `IonChangeTimestamp` datetime NOT NULL,
-  `deleted` tinyint(4) DEFAULT NULL,
-  `ammnt_FirId` int(11) DEFAULT NULL,
   PRIMARY KEY (`PK`),
-  KEY `index1` (`ServiceID`,`ServicePropertiesTypeID`,`ammnt_FirId`)
+  KEY `index1` (`ServiceID`,`ServicePropertiesTypeID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 --
@@ -80,11 +59,8 @@ CREATE TABLE `S2A4` (
   `ServiceID` int(11) NOT NULL,
   `ServicePropertiesTypeID` int(11) NOT NULL,
   `ServicePropertiesTypeValue` double NOT NULL,
-  `IonChangeTimestamp` datetime NOT NULL,
-  `ammnt_FirId` int(11) DEFAULT NULL,
-  `deleted` tinyint(4) DEFAULT NULL,
   PRIMARY KEY (`PK`),
-  KEY `index1` (`ServiceID`,`ServicePropertiesTypeID`,`ammnt_FirId`)
+  KEY `index1` (`ServiceID`,`ServicePropertiesTypeID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 --
@@ -96,11 +72,8 @@ CREATE TABLE `S2A5` (
   `ServiceID` int(11) NOT NULL,
   `ServicePropertiesTypeID` int(11) NOT NULL,
   `ServicePropertiesTypeValue` double NOT NULL,
-  `IonChangeTimestamp` datetime NOT NULL,
-  `ammnt_FirId` int(11) DEFAULT NULL,
-  `deleted` tinyint(4) DEFAULT NULL,
   PRIMARY KEY (`PK`),
-  KEY `index1` (`ServiceID`,`ServicePropertiesTypeID`,`ammnt_FirId`)
+  KEY `index1` (`ServiceID`,`ServicePropertiesTypeID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 --
@@ -112,11 +85,8 @@ CREATE TABLE `S2A6` (
   `ServiceID` int(11) NOT NULL,
   `ServicePropertiesTypeID` int(11) NOT NULL,
   `ServicePropertiesTypeValue` tinyblob NOT NULL,
-  `IonChangeTimestamp` datetime NOT NULL,
-  `ammnt_FirId` int(11) DEFAULT NULL,
-  `deleted` tinyint(4) DEFAULT NULL,
   PRIMARY KEY (`PK`),
-  KEY `index1` (`ServiceID`,`ServicePropertiesTypeID`,`ammnt_FirId`)
+  KEY `index1` (`ServiceID`,`ServicePropertiesTypeID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 --
@@ -128,22 +98,8 @@ CREATE TABLE `S2A7` (
   `ServiceID` int(11) NOT NULL,
   `ServicePropertiesTypeID` int(11) NOT NULL,
   `ServicePropertiesTypeValue` double NOT NULL,
-  `IonChangeTimestamp` datetime NOT NULL,
-  `ammnt_FirId` int(11) DEFAULT NULL,
-  `deleted` tinyint(4) DEFAULT NULL,
   PRIMARY KEY (`PK`),
-  KEY `index1` (`ServiceID`,`ServicePropertiesTypeID`,`ammnt_FirId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `S2L`
---
-
-CREATE TABLE `S2L` (
-  `RefID` int(11) NOT NULL,
-  `LanguageID` int(11) NOT NULL,
-  `Translation` varchar(200) NOT NULL,
-  PRIMARY KEY (`RefID`)
+  KEY `index1` (`ServiceID`,`ServicePropertiesTypeID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 --
@@ -167,16 +123,10 @@ CREATE TABLE `S3A1` (
   `ServiceEntityID` int(11) NOT NULL,
   `ServiceEntityPropertiesTypeID` int(11) NOT NULL,
   `ServiceEntityPropertiesTypeValue` double NOT NULL,
-  `IonChangeTimestamp` datetime NOT NULL,
-  `UserID` int(11) NOT NULL,
   `ParentServiceId` int(11) DEFAULT NULL,
-  `deleted` int(11) DEFAULT '0',
-  `ammnt_FirId` int(11) DEFAULT NULL,
   PRIMARY KEY (`PK`),
   KEY `index1` (`ServiceEntityPropertiesTypeID`,`ServiceEntityID`,`ParentServiceId`),
-  KEY `index3` (`deleted`),
-  KEY `index4` (`ServiceEntityID`,`ParentServiceId`),
-  KEY `index5` (`ammnt_FirId`)
+  KEY `index4` (`ServiceEntityID`,`ParentServiceId`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
@@ -188,16 +138,10 @@ CREATE TABLE `S3A2` (
   `ServiceEntityID` int(11) NOT NULL,
   `ServiceEntityPropertiesTypeID` int(11) NOT NULL,
   `ServiceEntityPropertiesTypeValue` int(11) NOT NULL,
-  `IonChangeTimestamp` datetime NOT NULL,
-  `UserID` int(11) NOT NULL,
   `ParentServiceId` int(11) DEFAULT NULL,
-  `deleted` int(11) DEFAULT NULL,
-  `ammnt_FirId` int(11) DEFAULT NULL,
   PRIMARY KEY (`PK`),
   KEY `index1` (`ServiceEntityPropertiesTypeID`,`ServiceEntityID`,`ParentServiceId`),
-  KEY `index3` (`deleted`),
-  KEY `index4` (`ServiceEntityID`,`ParentServiceId`),
-  KEY `index5` (`ammnt_FirId`)
+  KEY `index4` (`ServiceEntityID`,`ParentServiceId`)
 ) ENGINE=InnoDB AUTO_INCREMENT=93914 DEFAULT CHARSET=utf8;
 
 --
@@ -209,16 +153,10 @@ CREATE TABLE `S3A3` (
   `ServiceEntityID` int(11) NOT NULL,
   `ServiceEntityPropertiesTypeID` int(11) NOT NULL,
   `ServiceEntityPropertiesTypeValue` longtext NOT NULL,
-  `IonChangeTimestamp` datetime NOT NULL,
-  `UserID` int(11) NOT NULL,
   `ParentServiceId` int(11) DEFAULT NULL,
-  `deleted` int(11) DEFAULT NULL,
-  `ammnt_FirId` int(11) DEFAULT NULL,
   PRIMARY KEY (`PK`),
   KEY `index1` (`ServiceEntityPropertiesTypeID`,`ServiceEntityID`,`ParentServiceId`),
-  KEY `Index3` (`deleted`),
-  KEY `index4` (`ParentServiceId`,`ServiceEntityID`),
-  KEY `index5` (`ammnt_FirId`)
+  KEY `index4` (`ParentServiceId`,`ServiceEntityID`)
 ) ENGINE=InnoDB AUTO_INCREMENT=183363 DEFAULT CHARSET=utf8;
 
 --
@@ -230,16 +168,10 @@ CREATE TABLE `S3A4` (
   `ServiceEntityID` int(11) NOT NULL,
   `ServiceEntityPropertiesTypeID` int(11) NOT NULL,
   `ServiceEntityPropertiesTypeValue` varchar(50) NOT NULL,
-  `IonChangeTimestamp` datetime NOT NULL,
-  `UserID` int(11) NOT NULL,
   `ParentServiceId` int(11) DEFAULT NULL,
-  `deleted` int(11) DEFAULT NULL,
-  `ammnt_FirId` int(11) DEFAULT NULL,
   PRIMARY KEY (`PK`),
   KEY `index1` (`ServiceEntityPropertiesTypeID`,`ServiceEntityID`,`ParentServiceId`),
-  KEY `index3` (`deleted`),
-  KEY `index4` (`ServiceEntityID`,`ParentServiceId`),
-  KEY `index5` (`ammnt_FirId`)
+  KEY `index4` (`ServiceEntityID`,`ParentServiceId`)
 ) ENGINE=InnoDB AUTO_INCREMENT=9851 DEFAULT CHARSET=utf8;
 
 --
@@ -251,16 +183,10 @@ CREATE TABLE `S3A5` (
   `ServiceEntityID` int(11) NOT NULL,
   `ServiceEntityPropertiesTypeID` int(11) NOT NULL,
   `ServiceEntityPropertiesTypeValue` datetime NOT NULL,
-  `IonChangeTimestamp` datetime NOT NULL,
-  `UserID` int(11) NOT NULL,
   `ParentServiceId` int(11) DEFAULT NULL,
-  `deleted` int(11) DEFAULT NULL,
-  `ammnt_FirId` int(11) DEFAULT NULL,
   PRIMARY KEY (`PK`),
   KEY `index1` (`ServiceEntityPropertiesTypeID`,`ServiceEntityID`,`ParentServiceId`),
-  KEY `index3` (`deleted`),
-  KEY `index4` (`ServiceEntityID`,`ParentServiceId`),
-  KEY `index5` (`ammnt_FirId`)
+  KEY `index4` (`ServiceEntityID`,`ParentServiceId`)
 ) ENGINE=InnoDB AUTO_INCREMENT=737 DEFAULT CHARSET=utf8;
 
 --
@@ -272,14 +198,8 @@ CREATE TABLE `S3A6` (
   `ServiceEntityID` int(11) NOT NULL,
   `ServiceEntityPropertiesTypeID` int(11) NOT NULL,
   `ServiceEntityPropertiesTypeValue` longblob NOT NULL,
-  `IonChangeTimestamp` datetime NOT NULL,
-  `UserId` int(11) NOT NULL,
   `ParentServiceId` int(11) DEFAULT NULL,
-  `deleted` int(11) DEFAULT NULL,
-  `ammnt_FirId` int(11) DEFAULT NULL,
   PRIMARY KEY (`PK`),
-  KEY `index3` (`deleted`),
-  KEY `index5` (`ammnt_FirId`),
   KEY `index1` (`ServiceEntityID`),
   KEY `index6` (`ParentServiceId`),
   KEY `index4` (`ServiceEntityID`)
@@ -294,30 +214,12 @@ CREATE TABLE `S3A7` (
   `ServiceEntityID` int(11) NOT NULL,
   `ServiceEntityPropertiesTypeID` int(11) NOT NULL,
   `ServiceEntityPropertiesTypeValue` tinyint(1) NOT NULL,
-  `IonChangeTimestamp` datetime NOT NULL,
-  `UserID` int(11) NOT NULL,
   `ParentServiceId` int(11) DEFAULT NULL,
-  `ammnt_FirId` int(11) DEFAULT NULL,
-  `deleted` int(11) DEFAULT '0',
   PRIMARY KEY (`PK`),
   KEY `index1` (`ServiceEntityPropertiesTypeID`,`ServiceEntityID`,`ParentServiceId`),
-  KEY `Index2` (`ammnt_FirId`),
-  KEY `Index3` (`deleted`),
   KEY `index4` (`ServiceEntityID`,`ParentServiceId`)
 ) ENGINE=InnoDB AUTO_INCREMENT=4884 DEFAULT CHARSET=utf8;
 
---
--- Table structure for table `S3L`
---
-
-CREATE TABLE `S3L` (
-  `PK` int(11) NOT NULL AUTO_INCREMENT,
-  `RefID` int(11) NOT NULL,
-  `LanguageID` int(11) NOT NULL,
-  `Translation` varchar(200) NOT NULL,
-  PRIMARY KEY (`PK`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
-
 --
 -- Table structure for table `S3T`
 --
@@ -357,18 +259,6 @@ CREATE TABLE `S4` (
   KEY `index6` (`ServiceEntityID`,`ParentServiceID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
---
--- Table structure for table `S5L`
---
-
-CREATE TABLE `S5L` (
-  `PK` int(11) NOT NULL AUTO_INCREMENT,
-  `RefID` int(11) NOT NULL,
-  `LanguageID` int(11) NOT NULL,
-  `Translation` varchar(100) NOT NULL,
-  PRIMARY KEY (`PK`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
-
 --
 -- Table structure for table `S5T`
 --
diff --git a/schema/ofm/users.sql b/schema/ofm/users.sql
index a770633..67d4a4f 100644
--- a/schema/ofm/users.sql
+++ b/schema/ofm/users.sql
@@ -1,39 +1,3 @@
---
--- Table structure for table `U13`
---
-
-CREATE TABLE `U13` (
-  `PK` int(11) NOT NULL AUTO_INCREMENT,
-  `RefID` int(11) NOT NULL,
-  `LanguageID` int(11) NOT NULL,
-  `Translation` varchar(200) NOT NULL,
-  PRIMARY KEY (`PK`)
-) ENGINE=InnoDB AUTO_INCREMENT=57 DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `U14`
---
-
-CREATE TABLE `U14` (
-  `PK` int(11) NOT NULL AUTO_INCREMENT,
-  `RefID` int(11) NOT NULL,
-  `LanguageID` int(11) NOT NULL,
-  `Translation` varchar(100) NOT NULL,
-  PRIMARY KEY (`PK`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
-
---
--- Table structure for table `U15`
---
-
-CREATE TABLE `U15` (
-  `PK` int(11) NOT NULL AUTO_INCREMENT,
-  `RefID` int(11) NOT NULL,
-  `LanguageID` int(11) NOT NULL,
-  `Translation` varchar(200) NOT NULL,
-  PRIMARY KEY (`PK`)
-) ENGINE=InnoDB AUTO_INCREMENT=59 DEFAULT CHARSET=utf8;
-
 --
 -- Table structure for table `U1T`
 --
@@ -44,8 +8,6 @@ CREATE TABLE `U1T` (
   `Password` varchar(20) NOT NULL,
   `MainlanguagePref` int(11) DEFAULT NULL,
   `IonChangeTimeStamp` datetime DEFAULT NULL,
-  `openIdProvider` varchar(45) DEFAULT NULL,
-  `openIdSubject` varchar(100) DEFAULT NULL,
   PRIMARY KEY (`UserID`),
   KEY `index1` (`Username`,`UserID`,`Password`,`MainlanguagePref`)
 ) ENGINE=MyISAM AUTO_INCREMENT=223 DEFAULT CHARSET=utf8;
@@ -71,11 +33,8 @@ CREATE TABLE `U2A1` (
   `UserID` int(11) NOT NULL,
   `UserPropertiesTypeID` int(11) NOT NULL,
   `UserPropertiesTypeValue` float NOT NULL,
-  `Hidden` tinyint(1) NOT NULL,
-  `IonChangeTimestamp` datetime DEFAULT NULL,
   PRIMARY KEY (`Pk`),
-  KEY `index1` (`UserID`,`UserPropertiesTypeID`),
-  KEY `Index2` (`UserID`,`Hidden`)
+  KEY `index1` (`UserID`,`UserPropertiesTypeID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
@@ -87,11 +46,8 @@ CREATE TABLE `U2A2` (
   `UserID` int(11) NOT NULL,
   `UserPropertiesTypeID` int(11) NOT NULL,
   `UserPropertiesTypeValue` int(11) NOT NULL,
-  `Hidden` tinyint(1) NOT NULL,
-  `IonChangeTimestamp` datetime DEFAULT NULL,
   PRIMARY KEY (`Pk`),
-  KEY `index1` (`UserID`,`UserPropertiesTypeID`),
-  KEY `index2` (`UserID`,`Hidden`)
+  KEY `index1` (`UserID`,`UserPropertiesTypeID`)
 ) ENGINE=InnoDB AUTO_INCREMENT=3948 DEFAULT CHARSET=utf8;
 
 --
@@ -103,11 +59,8 @@ CREATE TABLE `U2A3` (
   `UserID` int(11) NOT NULL,
   `UserPropertiesTypeID` int(11) NOT NULL,
   `UserPropertiesTypeValue` varchar(200) NOT NULL,
-  `Hidden` tinyint(1) NOT NULL,
-  `IonChangeTimestamp` datetime DEFAULT NULL,
   PRIMARY KEY (`Pk`),
-  KEY `index1` (`UserID`,`UserPropertiesTypeID`),
-  KEY `index2` (`UserID`,`Hidden`)
+  KEY `index1` (`UserID`,`UserPropertiesTypeID`)
 ) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
 
 --
@@ -119,11 +72,8 @@ CREATE TABLE `U2A4` (
   `UserID` int(11) NOT NULL,
   `UserPropertiesTypeID` int(11) NOT NULL,
   `UserPropertiesTypeValue` varchar(50) NOT NULL,
-  `Hidden` tinyint(1) NOT NULL,
-  `IonChangeTimestamp` datetime DEFAULT NULL,
   PRIMARY KEY (`Pk`),
-  KEY `index1` (`UserID`,`UserPropertiesTypeID`),
-  KEY `index2` (`Hidden`)
+  KEY `index1` (`UserID`,`UserPropertiesTypeID`)
 ) ENGINE=InnoDB AUTO_INCREMENT=840 DEFAULT CHARSET=utf8;
 
 --
@@ -135,11 +85,8 @@ CREATE TABLE `U2A5` (
   `UserID` int(11) NOT NULL,
   `UserPropertiesTypeID` int(11) NOT NULL,
   `UserPropertiesTypeValue` datetime NOT NULL,
-  `Hidden` tinyint(1) NOT NULL,
-  `IonChangeTimestamp` datetime DEFAULT NULL,
   PRIMARY KEY (`Pk`),
-  KEY `index1` (`UserID`,`UserPropertiesTypeID`),
-  KEY `index2` (`Hidden`)
+  KEY `index1` (`UserID`,`UserPropertiesTypeID`)
 ) ENGINE=InnoDB AUTO_INCREMENT=147 DEFAULT CHARSET=utf8;
 
 --
@@ -152,11 +99,8 @@ CREATE TABLE `U2A6` (
   `UserPropertiesTypeID` int(11) NOT NULL,
   `UserPropertiesTypeValue` longblob NOT NULL,
   `UserPropertiesTypeFilesize` int(11) NOT NULL,
-  `Hidden` tinyint(1) NOT NULL,
-  `IonChangeTimestamp` datetime DEFAULT NULL,
   PRIMARY KEY (`Pk`),
-  KEY `index1` (`UserID`,`UserPropertiesTypeID`),
-  KEY `index2` (`Hidden`)
+  KEY `index1` (`UserID`,`UserPropertiesTypeID`)
 ) ENGINE=InnoDB AUTO_INCREMENT=158 DEFAULT CHARSET=utf8;
 
 --
@@ -168,27 +112,10 @@ CREATE TABLE `U2A7` (
   `UserID` int(11) NOT NULL,
   `UserPropertiesTypeID` int(11) NOT NULL,
   `UserPropertiesTypeValue` tinyint(1) NOT NULL,
-  `Hidden` tinyint(1) NOT NULL,
-  `IonChangeTimestamp` datetime DEFAULT NULL,
   PRIMARY KEY (`Pk`),
-  KEY `index1` (`UserID`,`UserPropertiesTypeID`),
-  KEY `index2` (`Hidden`)
+  KEY `index1` (`UserID`,`UserPropertiesTypeID`)
 ) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8;
 
---
--- Table structure for table `U2L`
---
-
-CREATE TABLE `U2L` (
-  `PK` int(11) NOT NULL AUTO_INCREMENT,
-  `RefID` int(11) NOT NULL,
-  `LanguageID` int(11) NOT NULL,
-  `Translation` varchar(200) NOT NULL,
-  PRIMARY KEY (`PK`),
-  KEY `index1` (`RefID`,`LanguageID`),
-  KEY `index2` (`RefID`,`Translation`)
-) ENGINE=InnoDB AUTO_INCREMENT=42 DEFAULT CHARSET=utf8;
-
 --
 -- Table structure for table `U2T`
 --
@@ -215,6 +142,5 @@ CREATE TABLE `U3T` (
   `UserCategoryID` int(11) NOT NULL AUTO_INCREMENT,
   `UserCategoryName` varchar(50) NOT NULL,
   PRIMARY KEY (`UserCategoryID`),
-  KEY `index1` (`UserCategoryID`),
   KEY `index2` (`UserCategoryName`)
 ) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;