diff --git a/COMSQL.H b/COMSQL.H
index eb7077b7..2e97e99c 100644
--- a/COMSQL.H
+++ b/COMSQL.H
@@ -17,14 +17,14 @@
 #define _MKSTRING(a) STRINGIZE(a)
 
 /*
- * The database schema version; must increase with every release
+ * The database schema version must increase with every release
  * It is now defined by external macro _DBV
  */
 /* The minimum required software version */
 #define _VERSIONMAJ 5
 #define _VERSIONMIN 3
-#define _VERSIONPATCH STRINGIZE(1)
-#define _VERSION '5.3.1'
+#define _VERSIONPATCH STRINGIZE(2)
+#define _VERSION '5.3.2'
 #define _DBV_STRING _MKSTRING(_DBV)
 
 #define REGISTERONCE(f, r) \
@@ -221,49 +221,9 @@ INTO x
 #define _INTO3(x) \
 ,x
 
-#define _DUMMY1_FROM \
-DECLARE dummy CHAR;~BEGIN~SELECT 'X' INTO dummy FROM
-#define _DUMMY1_WHEN1
-#define _DUMMY1_WHEN0 \
-EXCEPTION WHEN NO_DATA_FOUND THEN
-#define _DUMMY1_WHEN2 \
-WHEN TOO_MANY_ROWS THEN
-#define _DUMMY1_END1
-#define _DUMMY1_END2 \
-end;
-
-#define _U_NEW \
-:new.
-#define _U_OLD \
-:old.
-
-#define _U_UPDATE(table,field,new) \
-field := new;
-
 #define UPDATE_UPPER(omschrijving, upper_omschrijving,tab)          \
  :new.upper_omschrijving := UPPER(:new.omschrijving)
 
-#define _BEFORE_INSERT_OR_UPDATE(TableName) \
-BEFORE INSERT OR UPDATE ON TableName
-
-#define _AFTER_UPDATE(TableName) \
-AFTER UPDATE ON TableName
-
-#define _BEFORE_UPDATE(TableName) \
-BEFORE UPDATE ON TableName
-
-#define _BEFORE_INSERT_OR_UPDATE_OR_DELETE(TableName) \
-BEFORE INSERT OR UPDATE OR DELETE ON TableName
-
-#define _AFTER_INSERT_OR_UPDATE_OR_DELETE(TableName) \
-AFTER INSERT OR UPDATE OR DELETE ON TableName
-
-#define _AFTER_INSERT_OR_UPDATE(TableName) \
-AFTER INSERT OR UPDATE ON TableName
-
-#define _BEFORE_DELETE(TableName) \
-BEFORE DELETE ON TableName
-
 #define UPDATE_AANMAAKDATUM(TableName, Datum_veld)          \
  BEGIN                                                      \
    IF :new.Datum_veld IS NULL                   \
@@ -272,11 +232,6 @@ BEFORE DELETE ON TableName
    END IF;                          \
  END
 
-#define _OR_REPLACE \
-OR REPLACE
-
-#define _FOR_EACH_ROW \
-FOR EACH ROW
 
 #define _CC \
 ||