remove old sql scripts

14 files changed, 2 insertions, 3108 deletions

diff --git a/scripts/blocks-ports-old.tsv b/data/blocks-ports-old.tsv
index 281331da..281331da 100644
--- a/scripts/blocks-ports-old.tsv
+++ b/data/blocks-ports-old.tsv
diff --git a/data/compare.sql b/data/compare.sql
deleted file mode 100644
index e93b209b..00000000
--- a/data/compare.sql
+++ /dev/null
@@ -1,520 +0,0 @@
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000", p001 = T."P001", p002 = T."P002", p003 = T."P003", p004 = T."P004",
-p005 = T."P005", p006 = T."P006", p007 = T."P007", p008 = T."P008", p009 = T."P009",
-p010 = T."P010", p011 = T."P011", p012 = T."P012", p013 = T."P013", p014 = T."P014",
-p015 = T."P015", p016 = T."P016", p017 = T."P017", p018 = T."P018"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004",
-tmp_block."P005", tmp_block."P006", tmp_block."P007", tmp_block."P008", tmp_block."P009",
-tmp_block."P010", tmp_block."P011", tmp_block."P012", tmp_block."P013", tmp_block."P014",
-tmp_block."P015", tmp_block."P016", tmp_block."P017", tmp_block."P018", tmp_block."P019"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'CBLOCK4') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000", p001 = T."P001", p002 = T."P002", p003 = T."P003", p004 = T."P004",
-p005 = T."P005", p006 = T."P006", p007 = T."P007", p008 = T."P008", p009 = T."P009",
-p010 = T."P010", p011 = T."P011", p012 = T."P012", p013 = T."P013"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004",
-tmp_block."P005", tmp_block."P006", tmp_block."P007", tmp_block."P008", tmp_block."P009",
-tmp_block."P010", tmp_block."P011", tmp_block."P012", tmp_block."P013", tmp_block."P014"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'CBLOCK') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000", p001 = T."P001", p002 = T."P002", p003 = T."P003", p004 = T."P004",
-p005 = T."P005", p006 = T."P006", p007 = T."P007", p008 = T."P008", p009 = T."P009",
-p010 = T."P010"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004",
-tmp_block."P005", tmp_block."P006", tmp_block."P007", tmp_block."P008", tmp_block."P009",
-tmp_block."P010", tmp_block."P011", tmp_block."P012", tmp_block."P013", tmp_block."P014"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'CANIMXY') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p009 = T."P009"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004",
-tmp_block."P005", tmp_block."P006", tmp_block."P007", tmp_block."P008", tmp_block."P009"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'CSCOPXY') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000", p001 = T."P001", p002 = T."P002", p003 = T."P003", p004 = T."P004",
-p005 = T."P005", p006 = T."P006", p007 = T."P007", p008 = T."P008"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004",
-tmp_block."P005", tmp_block."P006", tmp_block."P007", tmp_block."P008", tmp_block."P009"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'CFSCOPE') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000", p001 = T."P001", p002 = T."P002", p003 = T."P003", p004 = T."P004",
-p005 = T."P005", p006 = T."P006", p007 = T."P007", p008 = T."P008"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004",
-tmp_block."P005", tmp_block."P006", tmp_block."P007", tmp_block."P008", tmp_block."P009"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'Bache') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000", p001 = T."P001", p002 = T."P002", p003 = T."P003", p004 = T."P004",
-p005 = T."P005", p006 = T."P006"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004",
-tmp_block."P005", tmp_block."P006", tmp_block."P007", tmp_block."P008", tmp_block."P009"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'AFFICH_m') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000", p001 = T."P001", p002 = T."P002", p003 = T."P003", p004 = T."P004",
-p005 = T."P005"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004",
-tmp_block."P005", tmp_block."P006", tmp_block."P007", tmp_block."P008", tmp_block."P009"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'SUBMAT') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000", p001 = T."P001", p002 = T."P002", p003 = T."P003"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'SourceP') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000", p001 = T."P001", p002 = T."P002", p003 = T."P003"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'PuitsP') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000", p001 = T."P001", p002 = T."P002", p003 = T."P003"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'LOGICAL_OP') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000", p001 = T."P001", p002 = T."P002"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'SUMMATION') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000", p001 = T."P001", p002 = T."P002"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'RELATIONALOP') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000", p001 = T."P001", p002 = T."P002"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'MAXMIN') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000", p001 = T."P001", p002 = T."P002"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'MATMUL') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000", p001 = T."P001", p002 = T."P002"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'CONSTRAINT2_c') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000", p001 = T."P001", p002 = T."P002"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'ESELECT_f') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000", p001 = T."P001", p002 = T."P002"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'BACKLASH') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000", p001 = T."P001", p002 = T."P002"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'RICC') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000", p001 = T."P001", p002 = T."P002"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'REGISTER') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000", p001 = T."P001", p002 = T."P002"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'PRODUCT') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000", p001 = T."P001", p002 = T."P002"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'MATRESH') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000", p001 = T."P001"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'MATTRAN') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000", p001 = T."P001"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'MATSUM') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000", p001 = T."P001"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'MATSING') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000", p001 = T."P001"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'MATEIG') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000", p001 = T."P001"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'IFTHEL_f') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000", p001 = T."P001"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'CUMSUM') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000", p001 = T."P001"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'BITSET') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000", p001 = T."P001"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'BITCLEAR') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'SQRT') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'SIGNUM') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'ROOTCOEF') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'MATPINV') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'MATLU') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'MATINV') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'MATEXPM') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'MATDIV') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'MATDIAG') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'MATDET') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'MATBKSL') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = T."P000"
-FROM (SELECT xcosblocks_block.id,
-tmp_block."P000", tmp_block."P001", tmp_block."P002", tmp_block."P003", tmp_block."P004"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE name = 'CONSTRAINT_c') AS T
-WHERE xcosblocks_blockparameter.block_id = T.id;
-
-SELECT 'P000', name, xcosblocks_blockparameter.p000, tmp_block."P000"
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_blockparameter.p000 != tmp_block."P000";
-
-SELECT 'P001', name, xcosblocks_blockparameter.p001, tmp_block."P001"
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_blockparameter.p001 != tmp_block."P001";
-
-SELECT 'P002', name, xcosblocks_blockparameter.p002, tmp_block."P002"
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_blockparameter.p002 != tmp_block."P002";
-
-SELECT 'P003', name, xcosblocks_blockparameter.p003, tmp_block."P003"
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_blockparameter.p003 != tmp_block."P003";
-
-SELECT 'P004', name, xcosblocks_blockparameter.p004, tmp_block."P004"
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_blockparameter.p004 != tmp_block."P004";
-
-SELECT 'P005', name, xcosblocks_blockparameter.p005, tmp_block."P005"
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_blockparameter.p005 != tmp_block."P005";
-
-SELECT 'P006', name, xcosblocks_blockparameter.p006, tmp_block."P006"
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_blockparameter.p006 != tmp_block."P006";
-
-SELECT 'P007', name, xcosblocks_blockparameter.p007, tmp_block."P007"
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_blockparameter.p007 != tmp_block."P007";
-
-SELECT 'P008', name, xcosblocks_blockparameter.p008, tmp_block."P008"
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_blockparameter.p008 != tmp_block."P008";
-
-SELECT 'P009', name, xcosblocks_blockparameter.p009, tmp_block."P009"
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_blockparameter.p009 != tmp_block."P009";
-
-SELECT 'P010', name, xcosblocks_blockparameter.p010, tmp_block."P010"
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_blockparameter.p010 != tmp_block."P010";
-
-SELECT 'P011', name, xcosblocks_blockparameter.p011, tmp_block."P011"
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_blockparameter.p011 != tmp_block."P011";
-
-SELECT 'P012', name, xcosblocks_blockparameter.p012, tmp_block."P012"
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_blockparameter.p012 != tmp_block."P012";
-
-SELECT 'P013', name, xcosblocks_blockparameter.p013, tmp_block."P013"
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_blockparameter.p013 != tmp_block."P013";
-
-SELECT 'P014', name, xcosblocks_blockparameter.p014, tmp_block."P014"
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_blockparameter.p014 != tmp_block."P014";
-
-SELECT 'P015', name, xcosblocks_blockparameter.p015, tmp_block."P015"
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_blockparameter.p015 != tmp_block."P015";
-
-SELECT 'P016', name, xcosblocks_blockparameter.p016, tmp_block."P016"
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_blockparameter.p016 != tmp_block."P016";
-
-SELECT 'P017', name, xcosblocks_blockparameter.p017, tmp_block."P017"
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_blockparameter.p017 != tmp_block."P017";
-
-SELECT 'P018', name, xcosblocks_blockparameter.p018, tmp_block."P018"
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_blockparameter.p018 != tmp_block."P018";
-
-SELECT 'P019', name, xcosblocks_blockparameter.p019, tmp_block."P019"
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_blockparameter.p019 != tmp_block."P019";
diff --git a/data/compareinitial.sql b/data/compareinitial.sql
deleted file mode 100644
index cae86331..00000000
--- a/data/compareinitial.sql
+++ /dev/null
@@ -1,214 +0,0 @@
-UPDATE xcosblocks_block
-SET p000_value_initial = T."P000 Default"
-FROM (SELECT "Block Name", "P000 Default" FROM tmp_block WHERE "P000 Default" != '') AS T
-WHERE xcosblocks_block.name = T."Block Name";
-
-UPDATE xcosblocks_block
-SET p001_value_initial = T."P001 Default"
-FROM (SELECT "Block Name", "P001 Default" FROM tmp_block WHERE "P001 Default" != '') AS T
-WHERE xcosblocks_block.name = T."Block Name";
-
-UPDATE xcosblocks_block
-SET p002_value_initial = T."P002 Default"
-FROM (SELECT "Block Name", "P002 Default" FROM tmp_block WHERE "P002 Default" != '') AS T
-WHERE xcosblocks_block.name = T."Block Name";
-
-UPDATE xcosblocks_block
-SET p003_value_initial = T."P003 Default"
-FROM (SELECT "Block Name", "P003 Default" FROM tmp_block WHERE "P003 Default" != '') AS T
-WHERE xcosblocks_block.name = T."Block Name";
-
-UPDATE xcosblocks_block
-SET p004_value_initial = T."P004 Default"
-FROM (SELECT "Block Name", "P004 Default" FROM tmp_block WHERE "P004 Default" != '') AS T
-WHERE xcosblocks_block.name = T."Block Name";
-
-UPDATE xcosblocks_block
-SET p005_value_initial = T."P005 Default"
-FROM (SELECT "Block Name", "P005 Default" FROM tmp_block WHERE "P005 Default" != '') AS T
-WHERE xcosblocks_block.name = T."Block Name";
-
-UPDATE xcosblocks_block
-SET p006_value_initial = T."P006 Default"
-FROM (SELECT "Block Name", "P006 Default" FROM tmp_block WHERE "P006 Default" != '') AS T
-WHERE xcosblocks_block.name = T."Block Name";
-
-UPDATE xcosblocks_block
-SET p007_value_initial = T."P007 Default"
-FROM (SELECT "Block Name", "P007 Default" FROM tmp_block WHERE "P007 Default" != '') AS T
-WHERE xcosblocks_block.name = T."Block Name";
-
-UPDATE xcosblocks_block
-SET p008_value_initial = T."P008 Default"
-FROM (SELECT "Block Name", "P008 Default" FROM tmp_block WHERE "P008 Default" != '') AS T
-WHERE xcosblocks_block.name = T."Block Name";
-
-UPDATE xcosblocks_block
-SET p009_value_initial = T."P009 Default"
-FROM (SELECT "Block Name", "P009 Default" FROM tmp_block WHERE "P009 Default" != '') AS T
-WHERE xcosblocks_block.name = T."Block Name";
-
-UPDATE xcosblocks_block
-SET p010_value_initial = T."P010 Default"
-FROM (SELECT "Block Name", "P010 Default" FROM tmp_block WHERE "P010 Default" != '') AS T
-WHERE xcosblocks_block.name = T."Block Name";
-
-UPDATE xcosblocks_block
-SET p011_value_initial = T."P011 Default"
-FROM (SELECT "Block Name", "P011 Default" FROM tmp_block WHERE "P011 Default" != '') AS T
-WHERE xcosblocks_block.name = T."Block Name";
-
-UPDATE xcosblocks_block
-SET p012_value_initial = T."P012 Default"
-FROM (SELECT "Block Name", "P012 Default" FROM tmp_block WHERE "P012 Default" != '') AS T
-WHERE xcosblocks_block.name = T."Block Name";
-
-UPDATE xcosblocks_block
-SET p013_value_initial = T."P013 Default"
-FROM (SELECT "Block Name", "P013 Default" FROM tmp_block WHERE "P013 Default" != '') AS T
-WHERE xcosblocks_block.name = T."Block Name";
-
-UPDATE xcosblocks_block
-SET p014_value_initial = T."P014 Default"
-FROM (SELECT "Block Name", "P014 Default" FROM tmp_block WHERE "P014 Default" != '') AS T
-WHERE xcosblocks_block.name = T."Block Name";
-
-UPDATE xcosblocks_block
-SET p015_value_initial = T."P015 Default"
-FROM (SELECT "Block Name", "P015 Default" FROM tmp_block WHERE "P015 Default" != '') AS T
-WHERE xcosblocks_block.name = T."Block Name";
-
-UPDATE xcosblocks_block
-SET p016_value_initial = T."P016 Default"
-FROM (SELECT "Block Name", "P016 Default" FROM tmp_block WHERE "P016 Default" != '') AS T
-WHERE xcosblocks_block.name = T."Block Name";
-
-UPDATE xcosblocks_block
-SET p017_value_initial = T."P017 Default"
-FROM (SELECT "Block Name", "P017 Default" FROM tmp_block WHERE "P017 Default" != '') AS T
-WHERE xcosblocks_block.name = T."Block Name";
-
-UPDATE xcosblocks_block
-SET p018_value_initial = T."P018 Default"
-FROM (SELECT "Block Name", "P018 Default" FROM tmp_block WHERE "P018 Default" != '') AS T
-WHERE xcosblocks_block.name = T."Block Name";
-
-SELECT 'P000', name, p000_value_initial, "P000 Default"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE p000_value_initial != "P000 Default"
-ORDER BY name;
-
-SELECT 'P001', name, p001_value_initial, "P001 Default"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE p001_value_initial != "P001 Default"
-ORDER BY name;
-
-SELECT 'P002', name, p002_value_initial, "P002 Default"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE p002_value_initial != "P002 Default"
-ORDER BY name;
-
-SELECT 'P003', name, p003_value_initial, "P003 Default"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE p003_value_initial != "P003 Default"
-ORDER BY name;
-
-SELECT 'P004', name, p004_value_initial, "P004 Default"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE p004_value_initial != "P004 Default"
-ORDER BY name;
-
-SELECT 'P005', name, p005_value_initial, "P005 Default"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE p005_value_initial != "P005 Default"
-ORDER BY name;
-
-SELECT 'P006', name, p006_value_initial, "P006 Default"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE p006_value_initial != "P006 Default"
-ORDER BY name;
-
-SELECT 'P007', name, p007_value_initial, "P007 Default"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE p007_value_initial != "P007 Default"
-ORDER BY name;
-
-SELECT 'P008', name, p008_value_initial, "P008 Default"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE p008_value_initial != "P008 Default"
-ORDER BY name;
-
-SELECT 'P009', name, p009_value_initial, "P009 Default"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE p009_value_initial != "P009 Default"
-ORDER BY name;
-
-SELECT 'P010', name, p010_value_initial, "P010 Default"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE p010_value_initial != "P010 Default"
-ORDER BY name;
-
-SELECT 'P011', name, p011_value_initial, "P011 Default"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE p011_value_initial != "P011 Default"
-ORDER BY name;
-
-SELECT 'P012', name, p012_value_initial, "P012 Default"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE p012_value_initial != "P012 Default"
-ORDER BY name;
-
-SELECT 'P013', name, p013_value_initial, "P013 Default"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE p013_value_initial != "P013 Default"
-ORDER BY name;
-
-SELECT 'P014', name, p014_value_initial, "P014 Default"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE p014_value_initial != "P014 Default"
-ORDER BY name;
-
-SELECT 'P015', name, p015_value_initial, "P015 Default"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE p015_value_initial != "P015 Default"
-ORDER BY name;
-
-SELECT 'P016', name, p016_value_initial, "P016 Default"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE p016_value_initial != "P016 Default"
-ORDER BY name;
-
-SELECT 'P017', name, p017_value_initial, "P017 Default"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE p017_value_initial != "P017 Default"
-ORDER BY name;
-
-SELECT 'P018', name, p018_value_initial, "P018 Default"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE p018_value_initial != "P018 Default"
-ORDER BY name;
-
-SELECT 'P019', name, p019_value_initial, "P019 Default"
-FROM xcosblocks_block
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE p019_value_initial != "P019 Default"
-ORDER BY name;
diff --git a/data/comparetype.sql b/data/comparetype.sql
deleted file mode 100644
index 0cd32c8c..00000000
--- a/data/comparetype.sql
+++ /dev/null
@@ -1,335 +0,0 @@
-UPDATE xcosblocks_blockparameter
-SET p000_type_id = T.type_id
-FROM (
-    SELECT xcosblocks_blockparameter.id AS id, xcosblocks_parameterdatatype.id AS type_id
-    FROM xcosblocks_blockparameter
-    JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-    JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-    JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.name = tmp_block."P000 Type"
-) AS T
-WHERE xcosblocks_blockparameter.id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p001_type_id = T.type_id
-FROM (
-    SELECT xcosblocks_blockparameter.id AS id, xcosblocks_parameterdatatype.id AS type_id
-    FROM xcosblocks_blockparameter
-    JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-    JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-    JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.name = tmp_block."P001 Type"
-) AS T
-WHERE xcosblocks_blockparameter.id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p002_type_id = T.type_id
-FROM (
-    SELECT xcosblocks_blockparameter.id AS id, xcosblocks_parameterdatatype.id AS type_id
-    FROM xcosblocks_blockparameter
-    JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-    JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-    JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.name = tmp_block."P002 Type"
-) AS T
-WHERE xcosblocks_blockparameter.id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p003_type_id = T.type_id
-FROM (
-    SELECT xcosblocks_blockparameter.id AS id, xcosblocks_parameterdatatype.id AS type_id
-    FROM xcosblocks_blockparameter
-    JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-    JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-    JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.name = tmp_block."P003 Type"
-) AS T
-WHERE xcosblocks_blockparameter.id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p004_type_id = T.type_id
-FROM (
-    SELECT xcosblocks_blockparameter.id AS id, xcosblocks_parameterdatatype.id AS type_id
-    FROM xcosblocks_blockparameter
-    JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-    JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-    JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.name = tmp_block."P004 Type"
-) AS T
-WHERE xcosblocks_blockparameter.id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p005_type_id = T.type_id
-FROM (
-    SELECT xcosblocks_blockparameter.id AS id, xcosblocks_parameterdatatype.id AS type_id
-    FROM xcosblocks_blockparameter
-    JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-    JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-    JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.name = tmp_block."P005 Type"
-) AS T
-WHERE xcosblocks_blockparameter.id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p007_type_id = T.type_id
-FROM (
-    SELECT xcosblocks_blockparameter.id AS id, xcosblocks_parameterdatatype.id AS type_id
-    FROM xcosblocks_blockparameter
-    JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-    JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-    JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.name = tmp_block."P007 Type"
-) AS T
-WHERE xcosblocks_blockparameter.id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p008_type_id = T.type_id
-FROM (
-    SELECT xcosblocks_blockparameter.id AS id, xcosblocks_parameterdatatype.id AS type_id
-    FROM xcosblocks_blockparameter
-    JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-    JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-    JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.name = tmp_block."P008 Type"
-) AS T
-WHERE xcosblocks_blockparameter.id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p009_type_id = T.type_id
-FROM (
-    SELECT xcosblocks_blockparameter.id AS id, xcosblocks_parameterdatatype.id AS type_id
-    FROM xcosblocks_blockparameter
-    JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-    JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-    JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.name = tmp_block."P009 Type"
-) AS T
-WHERE xcosblocks_blockparameter.id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p010_type_id = T.type_id
-FROM (
-    SELECT xcosblocks_blockparameter.id AS id, xcosblocks_parameterdatatype.id AS type_id
-    FROM xcosblocks_blockparameter
-    JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-    JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-    JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.name = tmp_block."P010 Type"
-) AS T
-WHERE xcosblocks_blockparameter.id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p012_type_id = T.type_id
-FROM (
-    SELECT xcosblocks_blockparameter.id AS id, xcosblocks_parameterdatatype.id AS type_id
-    FROM xcosblocks_blockparameter
-    JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-    JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-    JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.name = tmp_block."P012 Type"
-) AS T
-WHERE xcosblocks_blockparameter.id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p013_type_id = T.type_id
-FROM (
-    SELECT xcosblocks_blockparameter.id AS id, xcosblocks_parameterdatatype.id AS type_id
-    FROM xcosblocks_blockparameter
-    JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-    JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-    JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.name = tmp_block."P013 Type"
-) AS T
-WHERE xcosblocks_blockparameter.id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p014_type_id = T.type_id
-FROM (
-    SELECT xcosblocks_blockparameter.id AS id, xcosblocks_parameterdatatype.id AS type_id
-    FROM xcosblocks_blockparameter
-    JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-    JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-    JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.name = tmp_block."P014 Type"
-) AS T
-WHERE xcosblocks_blockparameter.id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p014_type_id = T.type_id
-FROM (
-    SELECT xcosblocks_blockparameter.id AS id, xcosblocks_parameterdatatype.id AS type_id
-    FROM xcosblocks_blockparameter
-    JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-    JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-    JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.name = tmp_block."P014 Type"
-) AS T
-WHERE xcosblocks_blockparameter.id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p015_type_id = T.type_id
-FROM (
-    SELECT xcosblocks_blockparameter.id AS id, xcosblocks_parameterdatatype.id AS type_id
-    FROM xcosblocks_blockparameter
-    JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-    JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-    JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.name = tmp_block."P015 Type"
-) AS T
-WHERE xcosblocks_blockparameter.id = T.id;
-
-UPDATE xcosblocks_blockparameter
-SET p016_type_id = T.type_id
-FROM (
-    SELECT xcosblocks_blockparameter.id AS id, xcosblocks_parameterdatatype.id AS type_id
-    FROM xcosblocks_blockparameter
-    JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-    JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-    JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.name = tmp_block."P016 Type"
-) AS T
-WHERE xcosblocks_blockparameter.id = T.id;
-
-SELECT 'P000', xcosblocks_block.name, xcosblocks_parameterdatatype.name AS 'OLD TYPE', tmp_block."P000 Type" AS 'NEW TYPE'
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.id = xcosblocks_blockparameter.p000_type_id
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_parameterdatatype.name != tmp_block."P000 Type"
-ORDER BY xcosblocks_block.name;
-
-SELECT 'P001', xcosblocks_block.name, xcosblocks_parameterdatatype.name AS 'OLD TYPE', tmp_block."P001 Type" AS 'NEW TYPE'
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.id = xcosblocks_blockparameter.p001_type_id
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_parameterdatatype.name != tmp_block."P001 Type"
-ORDER BY xcosblocks_block.name;
-
-SELECT 'P002', xcosblocks_block.name, xcosblocks_parameterdatatype.name AS 'OLD TYPE', tmp_block."P002 Type" AS 'NEW TYPE'
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.id = xcosblocks_blockparameter.p002_type_id
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_parameterdatatype.name != tmp_block."P002 Type"
-ORDER BY xcosblocks_block.name;
-
-SELECT 'P003', xcosblocks_block.name, xcosblocks_parameterdatatype.name AS 'OLD TYPE', tmp_block."P003 Type" AS 'NEW TYPE'
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.id = xcosblocks_blockparameter.p003_type_id
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_parameterdatatype.name != tmp_block."P003 Type"
-ORDER BY xcosblocks_block.name;
-
-SELECT 'P004', xcosblocks_block.name, xcosblocks_parameterdatatype.name AS 'OLD TYPE', tmp_block."P004 Type" AS 'NEW TYPE'
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.id = xcosblocks_blockparameter.p004_type_id
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_parameterdatatype.name != tmp_block."P004 Type"
-ORDER BY xcosblocks_block.name;
-
-SELECT 'P005', xcosblocks_block.name, xcosblocks_parameterdatatype.name AS 'OLD TYPE', tmp_block."P005 Type" AS 'NEW TYPE'
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.id = xcosblocks_blockparameter.p005_type_id
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_parameterdatatype.name != tmp_block."P005 Type"
-ORDER BY xcosblocks_block.name;
-
-SELECT 'P006', xcosblocks_block.name, xcosblocks_parameterdatatype.name AS 'OLD TYPE', tmp_block."P006 Type" AS 'NEW TYPE'
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.id = xcosblocks_blockparameter.p006_type_id
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_parameterdatatype.name != tmp_block."P006 Type"
-ORDER BY xcosblocks_block.name;
-
-SELECT 'P007', xcosblocks_block.name, xcosblocks_parameterdatatype.name AS 'OLD TYPE', tmp_block."P007 Type" AS 'NEW TYPE'
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.id = xcosblocks_blockparameter.p007_type_id
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_parameterdatatype.name != tmp_block."P007 Type"
-ORDER BY xcosblocks_block.name;
-
-SELECT 'P008', xcosblocks_block.name, xcosblocks_parameterdatatype.name AS 'OLD TYPE', tmp_block."P008 Type" AS 'NEW TYPE'
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.id = xcosblocks_blockparameter.p008_type_id
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_parameterdatatype.name != tmp_block."P008 Type"
-ORDER BY xcosblocks_block.name;
-
-SELECT 'P009', xcosblocks_block.name, xcosblocks_parameterdatatype.name AS 'OLD TYPE', tmp_block."P009 Type" AS 'NEW TYPE'
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.id = xcosblocks_blockparameter.p009_type_id
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_parameterdatatype.name != tmp_block."P009 Type"
-ORDER BY xcosblocks_block.name;
-
-SELECT 'P010', xcosblocks_block.name, xcosblocks_parameterdatatype.name AS 'OLD TYPE', tmp_block."P010 Type" AS 'NEW TYPE'
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.id = xcosblocks_blockparameter.p010_type_id
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_parameterdatatype.name != tmp_block."P010 Type"
-ORDER BY xcosblocks_block.name;
-
-SELECT 'P011', xcosblocks_block.name, xcosblocks_parameterdatatype.name AS 'OLD TYPE', tmp_block."P011 Type" AS 'NEW TYPE'
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.id = xcosblocks_blockparameter.p011_type_id
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_parameterdatatype.name != tmp_block."P011 Type"
-ORDER BY xcosblocks_block.name;
-
-SELECT 'P012', xcosblocks_block.name, xcosblocks_parameterdatatype.name AS 'OLD TYPE', tmp_block."P012 Type" AS 'NEW TYPE'
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.id = xcosblocks_blockparameter.p012_type_id
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_parameterdatatype.name != tmp_block."P012 Type"
-ORDER BY xcosblocks_block.name;
-
-SELECT 'P013', xcosblocks_block.name, xcosblocks_parameterdatatype.name AS 'OLD TYPE', tmp_block."P013 Type" AS 'NEW TYPE'
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.id = xcosblocks_blockparameter.p013_type_id
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_parameterdatatype.name != tmp_block."P013 Type"
-ORDER BY xcosblocks_block.name;
-
-SELECT 'P014', xcosblocks_block.name, xcosblocks_parameterdatatype.name AS 'OLD TYPE', tmp_block."P014 Type" AS 'NEW TYPE'
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.id = xcosblocks_blockparameter.p014_type_id
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_parameterdatatype.name != tmp_block."P014 Type"
-ORDER BY xcosblocks_block.name;
-
-SELECT 'P015', xcosblocks_block.name, xcosblocks_parameterdatatype.name AS 'OLD TYPE', tmp_block."P015 Type" AS 'NEW TYPE'
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.id = xcosblocks_blockparameter.p015_type_id
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_parameterdatatype.name != tmp_block."P015 Type"
-ORDER BY xcosblocks_block.name;
-
-SELECT 'P016', xcosblocks_block.name, xcosblocks_parameterdatatype.name AS 'OLD TYPE', tmp_block."P016 Type" AS 'NEW TYPE'
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.id = xcosblocks_blockparameter.p016_type_id
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_parameterdatatype.name != tmp_block."P016 Type"
-ORDER BY xcosblocks_block.name;
-
-SELECT 'P017', xcosblocks_block.name, xcosblocks_parameterdatatype.name AS 'OLD TYPE', tmp_block."P017 Type" AS 'NEW TYPE'
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.id = xcosblocks_blockparameter.p017_type_id
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_parameterdatatype.name != tmp_block."P017 Type"
-ORDER BY xcosblocks_block.name;
-
-SELECT 'P018', xcosblocks_block.name, xcosblocks_parameterdatatype.name AS 'OLD TYPE', tmp_block."P018 Type" AS 'NEW TYPE'
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.id = xcosblocks_blockparameter.p018_type_id
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_parameterdatatype.name != tmp_block."P018 Type"
-ORDER BY xcosblocks_block.name;
-
-SELECT 'P019', xcosblocks_block.name, xcosblocks_parameterdatatype.name AS 'OLD TYPE', tmp_block."P019 Type" AS 'NEW TYPE'
-FROM xcosblocks_blockparameter
-JOIN xcosblocks_parameterdatatype ON xcosblocks_parameterdatatype.id = xcosblocks_blockparameter.p019_type_id
-JOIN xcosblocks_block ON xcosblocks_block.id = xcosblocks_blockparameter.block_id
-JOIN tmp_block ON tmp_block."Block Name" = xcosblocks_block.name
-WHERE xcosblocks_parameterdatatype.name != tmp_block."P019 Type"
-ORDER BY xcosblocks_block.name;
diff --git a/scripts/data-categories-blocks.tsv b/data/data-categories-blocks.tsv
index 00f0b91f..00f0b91f 100644
--- a/scripts/data-categories-blocks.tsv
+++ b/data/data-categories-blocks.tsv
diff --git a/data/initialize.sql b/data/initialize.sql
deleted file mode 100644
index db171195..00000000
--- a/data/initialize.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DROP TABLE tmp_block;
-.import --csv ../data/XcosBlocks.csv tmp_block
-
diff --git a/data/refactor.sql b/data/refactor.sql
deleted file mode 100644
index f65bcf6f..00000000
--- a/data/refactor.sql
+++ /dev/null
@@ -1,381 +0,0 @@
-INSERT INTO xcosblocks_newblock (
-    id, name, blockprefix_id, main_category_id, block_name, initial_display_parameter, simulation_function, block_image_path, block_width, block_height
-)
-SELECT id, name, blockprefix_id, main_category_id, block_name, initial_display_parameter, simulation_function, block_image_path, block_width, block_height
-FROM xcosblocks_block;
-
-INSERT INTO xcosblocks_newblock_categories (
-    id, newblock_id, category_id
-)
-SELECT id, block_id, category_id
-FROM xcosblocks_block_categories;
-
-INSERT INTO xcosblocks_newblockparameter (
-    block_id, p_order, p_label, p_type_id, p_help, p_value_initial
-)
-SELECT block_id, 0, p000, p000_type_id, p000_help, p000_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p000 IS NOT NULL
-AND p000 != ''
-UNION
-SELECT block_id, 1, p001, p001_type_id, p001_help, p001_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p001 IS NOT NULL
-AND p001 != ''
-UNION
-SELECT block_id, 2, p002, p002_type_id, p002_help, p002_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p002 IS NOT NULL
-AND p002 != ''
-UNION
-SELECT block_id, 3, p003, p003_type_id, p003_help, p003_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p003 IS NOT NULL
-AND p003 != ''
-UNION
-SELECT block_id, 4, p004, p004_type_id, p004_help, p004_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p004 IS NOT NULL
-AND p004 != ''
-UNION
-SELECT block_id, 5, p005, p005_type_id, p005_help, p005_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p005 IS NOT NULL
-AND p005 != ''
-UNION
-SELECT block_id, 6, p006, p006_type_id, p006_help, p006_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p006 IS NOT NULL
-AND p006 != ''
-UNION
-SELECT block_id, 7, p007, p007_type_id, p007_help, p007_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p007 IS NOT NULL
-AND p007 != ''
-UNION
-SELECT block_id, 8, p008, p008_type_id, p008_help, p008_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p008 IS NOT NULL
-AND p008 != ''
-UNION
-SELECT block_id, 9, p009, p009_type_id, p009_help, p009_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p009 IS NOT NULL
-AND p009 != ''
-UNION
-SELECT block_id, 10, p010, p010_type_id, p010_help, p010_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p010 IS NOT NULL
-AND p010 != ''
-UNION
-SELECT block_id, 11, p011, p011_type_id, p011_help, p011_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p011 IS NOT NULL
-AND p011 != ''
-UNION
-SELECT block_id, 12, p012, p012_type_id, p012_help, p012_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p012 IS NOT NULL
-AND p012 != ''
-UNION
-SELECT block_id, 13, p013, p013_type_id, p013_help, p013_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p013 IS NOT NULL
-AND p013 != ''
-UNION
-SELECT block_id, 14, p014, p014_type_id, p014_help, p014_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p014 IS NOT NULL
-AND p014 != ''
-UNION
-SELECT block_id, 15, p015, p015_type_id, p015_help, p015_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p015 IS NOT NULL
-AND p015 != ''
-UNION
-SELECT block_id, 16, p016, p016_type_id, p016_help, p016_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p016 IS NOT NULL
-AND p016 != ''
-UNION
-SELECT block_id, 17, p017, p017_type_id, p017_help, p017_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p017 IS NOT NULL
-AND p017 != ''
-UNION
-SELECT block_id, 18, p018, p018_type_id, p018_help, p018_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p018 IS NOT NULL
-AND p018 != ''
-UNION
-SELECT block_id, 19, p019, p019_type_id, p019_help, p019_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p019 IS NOT NULL
-AND p019 != ''
-UNION
-SELECT block_id, 20, p020, p020_type_id, p020_help, p020_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p020 IS NOT NULL
-AND p020 != ''
-UNION
-SELECT block_id, 21, p021, p021_type_id, p021_help, p021_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p021 IS NOT NULL
-AND p021 != ''
-UNION
-SELECT block_id, 22, p022, p022_type_id, p022_help, p022_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p022 IS NOT NULL
-AND p022 != ''
-UNION
-SELECT block_id, 23, p023, p023_type_id, p023_help, p023_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p023 IS NOT NULL
-AND p023 != ''
-UNION
-SELECT block_id, 24, p024, p024_type_id, p024_help, p024_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p024 IS NOT NULL
-AND p024 != ''
-UNION
-SELECT block_id, 25, p025, p025_type_id, p025_help, p025_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p025 IS NOT NULL
-AND p025 != ''
-UNION
-SELECT block_id, 26, p026, p026_type_id, p026_help, p026_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p026 IS NOT NULL
-AND p026 != ''
-UNION
-SELECT block_id, 27, p027, p027_type_id, p027_help, p027_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p027 IS NOT NULL
-AND p027 != ''
-UNION
-SELECT block_id, 28, p028, p028_type_id, p028_help, p028_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p028 IS NOT NULL
-AND p028 != ''
-UNION
-SELECT block_id, 29, p029, p029_type_id, p029_help, p029_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p029 IS NOT NULL
-AND p029 != ''
-UNION
-SELECT block_id, 30, p030, p030_type_id, p030_help, p030_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p030 IS NOT NULL
-AND p030 != ''
-UNION
-SELECT block_id, 31, p031, p031_type_id, p031_help, p031_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p031 IS NOT NULL
-AND p031 != ''
-UNION
-SELECT block_id, 32, p032, p032_type_id, p032_help, p032_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p032 IS NOT NULL
-AND p032 != ''
-UNION
-SELECT block_id, 33, p033, p033_type_id, p033_help, p033_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p033 IS NOT NULL
-AND p033 != ''
-UNION
-SELECT block_id, 34, p034, p034_type_id, p034_help, p034_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p034 IS NOT NULL
-AND p034 != ''
-UNION
-SELECT block_id, 35, p035, p035_type_id, p035_help, p035_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p035 IS NOT NULL
-AND p035 != ''
-UNION
-SELECT block_id, 36, p036, p036_type_id, p036_help, p036_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p036 IS NOT NULL
-AND p036 != ''
-UNION
-SELECT block_id, 37, p037, p037_type_id, p037_help, p037_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p037 IS NOT NULL
-AND p037 != ''
-UNION
-SELECT block_id, 38, p038, p038_type_id, p038_help, p038_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p038 IS NOT NULL
-AND p038 != ''
-UNION
-SELECT block_id, 39, p039, p039_type_id, p039_help, p039_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p039 IS NOT NULL
-AND p039 != ''
-UNION
-SELECT block_id, 40, p040, p040_type_id, p040_help, p040_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p040 IS NOT NULL
-AND p040 != ''
-UNION
-SELECT block_id, 41, p041, p041_type_id, p041_help, p041_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p041 IS NOT NULL
-AND p041 != ''
-UNION
-SELECT block_id, 42, p042, p042_type_id, p042_help, p042_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p042 IS NOT NULL
-AND p042 != ''
-UNION
-SELECT block_id, 43, p043, p043_type_id, p043_help, p043_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p043 IS NOT NULL
-AND p043 != ''
-UNION
-SELECT block_id, 44, p044, p044_type_id, p044_help, p044_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p044 IS NOT NULL
-AND p044 != ''
-UNION
-SELECT block_id, 45, p045, p045_type_id, p045_help, p045_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p045 IS NOT NULL
-AND p045 != ''
-UNION
-SELECT block_id, 46, p046, p046_type_id, p046_help, p046_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p046 IS NOT NULL
-AND p046 != ''
-UNION
-SELECT block_id, 47, p047, p047_type_id, p047_help, p047_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p047 IS NOT NULL
-AND p047 != ''
-UNION
-SELECT block_id, 48, p048, p048_type_id, p048_help, p048_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p048 IS NOT NULL
-AND p048 != ''
-UNION
-SELECT block_id, 49, p049, p049_type_id, p049_help, p049_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p049 IS NOT NULL
-AND p049 != ''
-UNION
-SELECT block_id, 50, p050, p050_type_id, p050_help, p050_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p050 IS NOT NULL
-AND p050 != ''
-UNION
-SELECT block_id, 51, p051, p051_type_id, p051_help, p051_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p051 IS NOT NULL
-AND p051 != ''
-UNION
-SELECT block_id, 52, p052, p052_type_id, p052_help, p052_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p052 IS NOT NULL
-AND p052 != ''
-UNION
-SELECT block_id, 53, p053, p053_type_id, p053_help, p053_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p053 IS NOT NULL
-AND p053 != ''
-UNION
-SELECT block_id, 54, p054, p054_type_id, p054_help, p054_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p054 IS NOT NULL
-AND p054 != ''
-UNION
-SELECT block_id, 55, p055, p055_type_id, p055_help, p055_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p055 IS NOT NULL
-AND p055 != ''
-UNION
-SELECT block_id, 56, p056, p056_type_id, p056_help, p056_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p056 IS NOT NULL
-AND p056 != ''
-UNION
-SELECT block_id, 57, p057, p057_type_id, p057_help, p057_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p057 IS NOT NULL
-AND p057 != ''
-UNION
-SELECT block_id, 58, p058, p058_type_id, p058_help, p058_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p058 IS NOT NULL
-AND p058 != ''
-UNION
-SELECT block_id, 59, p059, p059_type_id, p059_help, p059_value_initial
-FROM xcosblocks_block
-JOIN xcosblocks_blockparameter ON xcosblocks_blockparameter.block_id = xcosblocks_block.id
-WHERE p059 IS NOT NULL
-AND p059 != ''
-ORDER BY 1, 2;
-
-INSERT INTO xcosblocks_newblockport (
-    id, block_id, port_order, port_name, port_number, port_x, port_y, port_orientation, port_part, port_dmg, port_type
-)
-SELECT id, block_id, port_order, port_name, port_number, port_x, port_y, port_orientation, port_part, port_dmg, port_type
-FROM xcosblocks_blockport;
diff --git a/data/refactorold.sql b/data/refactorold.sql
deleted file mode 100644
index 77f15f48..00000000
--- a/data/refactorold.sql
+++ /dev/null
@@ -1,847 +0,0 @@
-UPDATE xcosblocks_block
-SET p000_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 0;
-
-DELETE FROM xcosblocks_blockparameter;
-DELETE FROM SQLITE_SEQUENCE WHERE name = 'xcosblocks_blockparameter';
-INSERT INTO xcosblocks_blockparameter (block_id)
-SELECT DISTINCT block_id
-FROM xcosblocks_newblockparameter
-ORDER BY block_id;
-
-UPDATE xcosblocks_blockparameter
-SET p000 = N.p_label,
-p000_help = N.p_help,
-p000_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 0;
-
-UPDATE xcosblocks_block
-SET p001_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 1;
-
-UPDATE xcosblocks_blockparameter
-SET p001 = N.p_label,
-p001_help = N.p_help,
-p001_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 1;
-
-UPDATE xcosblocks_block
-SET p002_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 2;
-
-UPDATE xcosblocks_blockparameter
-SET p002 = N.p_label,
-p002_help = N.p_help,
-p002_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 2;
-
-UPDATE xcosblocks_block
-SET p003_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 3;
-
-UPDATE xcosblocks_blockparameter
-SET p003 = N.p_label,
-p003_help = N.p_help,
-p003_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 3;
-
-UPDATE xcosblocks_block
-SET p004_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 4;
-
-UPDATE xcosblocks_blockparameter
-SET p004 = N.p_label,
-p004_help = N.p_help,
-p004_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 4;
-
-UPDATE xcosblocks_block
-SET p005_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 5;
-
-UPDATE xcosblocks_blockparameter
-SET p005 = N.p_label,
-p005_help = N.p_help,
-p005_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 5;
-
-UPDATE xcosblocks_block
-SET p006_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 6;
-
-UPDATE xcosblocks_blockparameter
-SET p006 = N.p_label,
-p006_help = N.p_help,
-p006_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 6;
-
-UPDATE xcosblocks_block
-SET p007_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 7;
-
-UPDATE xcosblocks_blockparameter
-SET p007 = N.p_label,
-p007_help = N.p_help,
-p007_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 7;
-
-UPDATE xcosblocks_block
-SET p008_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 8;
-
-UPDATE xcosblocks_blockparameter
-SET p008 = N.p_label,
-p008_help = N.p_help,
-p008_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 8;
-
-UPDATE xcosblocks_block
-SET p009_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 9;
-
-UPDATE xcosblocks_blockparameter
-SET p009 = N.p_label,
-p009_help = N.p_help,
-p009_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 9;
-
-UPDATE xcosblocks_block
-SET p010_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 10;
-
-UPDATE xcosblocks_blockparameter
-SET p010 = N.p_label,
-p010_help = N.p_help,
-p010_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 10;
-
-UPDATE xcosblocks_block
-SET p011_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 11;
-
-UPDATE xcosblocks_blockparameter
-SET p011 = N.p_label,
-p011_help = N.p_help,
-p011_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 11;
-
-UPDATE xcosblocks_block
-SET p012_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 12;
-
-UPDATE xcosblocks_blockparameter
-SET p012 = N.p_label,
-p012_help = N.p_help,
-p012_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 12;
-
-UPDATE xcosblocks_block
-SET p013_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 13;
-
-UPDATE xcosblocks_blockparameter
-SET p013 = N.p_label,
-p013_help = N.p_help,
-p013_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 13;
-
-UPDATE xcosblocks_block
-SET p014_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 14;
-
-UPDATE xcosblocks_blockparameter
-SET p014 = N.p_label,
-p014_help = N.p_help,
-p014_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 14;
-
-UPDATE xcosblocks_block
-SET p015_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 15;
-
-UPDATE xcosblocks_blockparameter
-SET p015 = N.p_label,
-p015_help = N.p_help,
-p015_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 15;
-
-UPDATE xcosblocks_block
-SET p016_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 16;
-
-UPDATE xcosblocks_blockparameter
-SET p016 = N.p_label,
-p016_help = N.p_help,
-p016_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 16;
-
-UPDATE xcosblocks_block
-SET p017_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 17;
-
-UPDATE xcosblocks_blockparameter
-SET p017 = N.p_label,
-p017_help = N.p_help,
-p017_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 17;
-
-UPDATE xcosblocks_block
-SET p018_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 18;
-
-UPDATE xcosblocks_blockparameter
-SET p018 = N.p_label,
-p018_help = N.p_help,
-p018_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 18;
-
-UPDATE xcosblocks_block
-SET p019_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 19;
-
-UPDATE xcosblocks_blockparameter
-SET p019 = N.p_label,
-p019_help = N.p_help,
-p019_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 19;
-
-UPDATE xcosblocks_block
-SET p020_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 20;
-
-UPDATE xcosblocks_blockparameter
-SET p020 = N.p_label,
-p020_help = N.p_help,
-p020_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 20;
-
-UPDATE xcosblocks_block
-SET p021_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 21;
-
-UPDATE xcosblocks_blockparameter
-SET p021 = N.p_label,
-p021_help = N.p_help,
-p021_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 21;
-
-UPDATE xcosblocks_block
-SET p022_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 22;
-
-UPDATE xcosblocks_blockparameter
-SET p022 = N.p_label,
-p022_help = N.p_help,
-p022_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 22;
-
-UPDATE xcosblocks_block
-SET p023_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 23;
-
-UPDATE xcosblocks_blockparameter
-SET p023 = N.p_label,
-p023_help = N.p_help,
-p023_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 23;
-
-UPDATE xcosblocks_block
-SET p024_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 24;
-
-UPDATE xcosblocks_blockparameter
-SET p024 = N.p_label,
-p024_help = N.p_help,
-p024_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 24;
-
-UPDATE xcosblocks_block
-SET p025_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 25;
-
-UPDATE xcosblocks_blockparameter
-SET p025 = N.p_label,
-p025_help = N.p_help,
-p025_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 25;
-
-UPDATE xcosblocks_block
-SET p026_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 26;
-
-UPDATE xcosblocks_blockparameter
-SET p026 = N.p_label,
-p026_help = N.p_help,
-p026_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 26;
-
-UPDATE xcosblocks_block
-SET p027_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 27;
-
-UPDATE xcosblocks_blockparameter
-SET p027 = N.p_label,
-p027_help = N.p_help,
-p027_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 27;
-
-UPDATE xcosblocks_block
-SET p028_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 28;
-
-UPDATE xcosblocks_blockparameter
-SET p028 = N.p_label,
-p028_help = N.p_help,
-p028_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 28;
-
-UPDATE xcosblocks_block
-SET p029_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 29;
-
-UPDATE xcosblocks_blockparameter
-SET p029 = N.p_label,
-p029_help = N.p_help,
-p029_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 29;
-
-UPDATE xcosblocks_block
-SET p030_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 30;
-
-UPDATE xcosblocks_blockparameter
-SET p030 = N.p_label,
-p030_help = N.p_help,
-p030_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 30;
-
-UPDATE xcosblocks_block
-SET p031_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 31;
-
-UPDATE xcosblocks_blockparameter
-SET p031 = N.p_label,
-p031_help = N.p_help,
-p031_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 31;
-
-UPDATE xcosblocks_block
-SET p032_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 32;
-
-UPDATE xcosblocks_blockparameter
-SET p032 = N.p_label,
-p032_help = N.p_help,
-p032_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 32;
-
-UPDATE xcosblocks_block
-SET p033_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 33;
-
-UPDATE xcosblocks_blockparameter
-SET p033 = N.p_label,
-p033_help = N.p_help,
-p033_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 33;
-
-UPDATE xcosblocks_block
-SET p034_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 34;
-
-UPDATE xcosblocks_blockparameter
-SET p034 = N.p_label,
-p034_help = N.p_help,
-p034_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 34;
-
-UPDATE xcosblocks_block
-SET p035_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 35;
-
-UPDATE xcosblocks_blockparameter
-SET p035 = N.p_label,
-p035_help = N.p_help,
-p035_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 35;
-
-UPDATE xcosblocks_block
-SET p036_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 36;
-
-UPDATE xcosblocks_blockparameter
-SET p036 = N.p_label,
-p036_help = N.p_help,
-p036_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 36;
-
-UPDATE xcosblocks_block
-SET p037_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 37;
-
-UPDATE xcosblocks_blockparameter
-SET p037 = N.p_label,
-p037_help = N.p_help,
-p037_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 37;
-
-UPDATE xcosblocks_block
-SET p038_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 38;
-
-UPDATE xcosblocks_blockparameter
-SET p038 = N.p_label,
-p038_help = N.p_help,
-p038_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 38;
-
-UPDATE xcosblocks_block
-SET p039_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 39;
-
-UPDATE xcosblocks_blockparameter
-SET p039 = N.p_label,
-p039_help = N.p_help,
-p039_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 39;
-
-UPDATE xcosblocks_block
-SET p040_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 40;
-
-UPDATE xcosblocks_blockparameter
-SET p040 = N.p_label,
-p040_help = N.p_help,
-p040_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 40;
-
-UPDATE xcosblocks_block
-SET p041_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 41;
-
-UPDATE xcosblocks_blockparameter
-SET p041 = N.p_label,
-p041_help = N.p_help,
-p041_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 41;
-
-UPDATE xcosblocks_block
-SET p042_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 42;
-
-UPDATE xcosblocks_blockparameter
-SET p042 = N.p_label,
-p042_help = N.p_help,
-p042_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 42;
-
-UPDATE xcosblocks_block
-SET p043_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 43;
-
-UPDATE xcosblocks_blockparameter
-SET p043 = N.p_label,
-p043_help = N.p_help,
-p043_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 43;
-
-UPDATE xcosblocks_block
-SET p044_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 44;
-
-UPDATE xcosblocks_blockparameter
-SET p044 = N.p_label,
-p044_help = N.p_help,
-p044_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 44;
-
-UPDATE xcosblocks_block
-SET p045_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 45;
-
-UPDATE xcosblocks_blockparameter
-SET p045 = N.p_label,
-p045_help = N.p_help,
-p045_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 45;
-
-UPDATE xcosblocks_block
-SET p046_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 46;
-
-UPDATE xcosblocks_blockparameter
-SET p046 = N.p_label,
-p046_help = N.p_help,
-p046_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 46;
-
-UPDATE xcosblocks_block
-SET p047_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 47;
-
-UPDATE xcosblocks_blockparameter
-SET p047 = N.p_label,
-p047_help = N.p_help,
-p047_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 47;
-
-UPDATE xcosblocks_block
-SET p048_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 48;
-
-UPDATE xcosblocks_blockparameter
-SET p048 = N.p_label,
-p048_help = N.p_help,
-p048_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 48;
-
-UPDATE xcosblocks_block
-SET p049_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 49;
-
-UPDATE xcosblocks_blockparameter
-SET p049 = N.p_label,
-p049_help = N.p_help,
-p049_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 49;
-
-UPDATE xcosblocks_block
-SET p050_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 50;
-
-UPDATE xcosblocks_blockparameter
-SET p050 = N.p_label,
-p050_help = N.p_help,
-p050_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 50;
-
-UPDATE xcosblocks_block
-SET p051_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 51;
-
-UPDATE xcosblocks_blockparameter
-SET p051 = N.p_label,
-p051_help = N.p_help,
-p051_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 51;
-
-UPDATE xcosblocks_block
-SET p052_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 52;
-
-UPDATE xcosblocks_blockparameter
-SET p052 = N.p_label,
-p052_help = N.p_help,
-p052_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 52;
-
-UPDATE xcosblocks_block
-SET p053_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 53;
-
-UPDATE xcosblocks_blockparameter
-SET p053 = N.p_label,
-p053_help = N.p_help,
-p053_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 53;
-
-UPDATE xcosblocks_block
-SET p054_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 54;
-
-UPDATE xcosblocks_blockparameter
-SET p054 = N.p_label,
-p054_help = N.p_help,
-p054_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 54;
-
-UPDATE xcosblocks_block
-SET p055_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 55;
-
-UPDATE xcosblocks_blockparameter
-SET p055 = N.p_label,
-p055_help = N.p_help,
-p055_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 55;
-
-UPDATE xcosblocks_block
-SET p056_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 56;
-
-UPDATE xcosblocks_blockparameter
-SET p056 = N.p_label,
-p056_help = N.p_help,
-p056_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 56;
-
-UPDATE xcosblocks_block
-SET p057_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 57;
-
-UPDATE xcosblocks_blockparameter
-SET p057 = N.p_label,
-p057_help = N.p_help,
-p057_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 57;
-
-UPDATE xcosblocks_block
-SET p058_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 58;
-
-UPDATE xcosblocks_blockparameter
-SET p058 = N.p_label,
-p058_help = N.p_help,
-p058_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 58;
-
-UPDATE xcosblocks_block
-SET p059_value_initial = N.p_value_initial
-FROM (SELECT block_id, p_order, p_value_initial FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_block.id
-AND N.p_order = 59;
-
-UPDATE xcosblocks_blockparameter
-SET p059 = N.p_label,
-p059_help = N.p_help,
-p059_type_id = N.p_type_id
-FROM (SELECT block_id, p_order, p_label, p_help, p_type_id FROM xcosblocks_newblockparameter) AS N
-WHERE N.block_id = xcosblocks_blockparameter.block_id
-AND N.p_order = 59;
-
diff --git a/inittable.sql b/inittable.sql
deleted file mode 100644
index 9b8d7966..00000000
--- a/inittable.sql
+++ /dev/null
@@ -1,641 +0,0 @@
-DELETE FROM xcosblocks_blockparameter;
-DELETE FROM xcosblocks_blockport;
-DELETE FROM xcosblocks_block_categories;
-DELETE FROM xcosblocks_block;
-DELETE FROM xcosblocks_blockprefixparameter;
-DELETE FROM xcosblocks_blockprefix;
-DELETE FROM xcosblocks_category;
-DELETE FROM xcosblocks_parameterdatatype;
-DELETE FROM xcosblocks_blocktype;
-
-ALTER TABLE xcosblocks_blockparameter AUTO_INCREMENT = 1;
-ALTER TABLE xcosblocks_blockport AUTO_INCREMENT = 1;
-ALTER TABLE xcosblocks_block_categories AUTO_INCREMENT = 1;
-ALTER TABLE xcosblocks_block AUTO_INCREMENT = 1;
-ALTER TABLE xcosblocks_blockprefixparameter AUTO_INCREMENT = 1;
-ALTER TABLE xcosblocks_blockprefix AUTO_INCREMENT = 1;
-ALTER TABLE xcosblocks_category AUTO_INCREMENT = 1;
-ALTER TABLE xcosblocks_parameterdatatype AUTO_INCREMENT = 1;
-ALTER TABLE xcosblocks_blocktype AUTO_INCREMENT = 1;
-
-SET @blocktype_name = 'Xcos';
-
-INSERT INTO xcosblocks_blocktype (name) VALUES (@blocktype_name);
-
-SELECT id INTO @blocktype_id FROM xcosblocks_blocktype WHERE name = @blocktype_name;
-
-LOAD DATA LOCAL INFILE 'data/datatypes.tsv'
-    INTO TABLE xcosblocks_parameterdatatype
-    FIELDS TERMINATED BY '\t'
-    LINES TERMINATED BY '\n'
-    (id, name, @tmp1);
-
-LOAD DATA LOCAL INFILE 'data/categories.tsv'
-    INTO TABLE xcosblocks_category
-    FIELDS TERMINATED BY '\t'
-    LINES TERMINATED BY '\n'
-    (id, name, sort_order, @tmp1)
-    SET blocktype_id = @blocktype_id;
-
-LOAD DATA LOCAL INFILE 'data/blockprefixes.tsv'
-    INTO TABLE xcosblocks_blockprefix
-    FIELDS TERMINATED BY '\t'
-    LINES TERMINATED BY '\n'
-    (id, name, @tmp2, @tmp3,
-    @p000_key, @p000, @p000_type, p000_value_initial,
-    @p001_key, @p001, @p001_type, p001_value_initial,
-    @p002_key, @p002, @p002_type, p002_value_initial,
-    @p003_key, @p003, @p003_type, p003_value_initial,
-    @p004_key, @p004, @p004_type, p004_value_initial,
-    @p005_key, @p005, @p005_type, p005_value_initial,
-    @p006_key, @p006, @p006_type, p006_value_initial,
-    @p007_key, @p007, @p007_type, p007_value_initial,
-    @p008_key, @p008, @p008_type, p008_value_initial,
-    @p009_key, @p009, @p009_type, p009_value_initial,
-    @p010_key, @p010, @p010_type, p010_value_initial,
-    @p011_key, @p011, @p011_type, p011_value_initial,
-    @p012_key, @p012, @p012_type, p012_value_initial,
-    @p013_key, @p013, @p013_type, p013_value_initial,
-    @p014_key, @p014, @p014_type, p014_value_initial,
-    @p015_key, @p015, @p015_type, p015_value_initial,
-    @p016_key, @p016, @p016_type, p016_value_initial,
-    @p017_key, @p017, @p017_type, p017_value_initial,
-    @p018_key, @p018, @p018_type, p018_value_initial,
-    @p019_key, @p019, @p019_type, p019_value_initial,
-    @p020_key, @p020, @p020_type, p020_value_initial,
-    @p021_key, @p021, @p021_type, p021_value_initial,
-    @p022_key, @p022, @p022_type, p022_value_initial,
-    @p023_key, @p023, @p023_type, p023_value_initial,
-    @p024_key, @p024, @p024_type, p024_value_initial,
-    @p025_key, @p025, @p025_type, p025_value_initial,
-    @p026_key, @p026, @p026_type, p026_value_initial,
-    @p027_key, @p027, @p027_type, p027_value_initial,
-    @p028_key, @p028, @p028_type, p028_value_initial,
-    @p029_key, @p029, @p029_type, p029_value_initial,
-    @p030_key, @p030, @p030_type, p030_value_initial,
-    @p031_key, @p031, @p031_type, p031_value_initial,
-    @p032_key, @p032, @p032_type, p032_value_initial,
-    @p033_key, @p033, @p033_type, p033_value_initial,
-    @p034_key, @p034, @p034_type, p034_value_initial,
-    @p035_key, @p035, @p035_type, p035_value_initial,
-    @p036_key, @p036, @p036_type, p036_value_initial,
-    @p037_key, @p037, @p037_type, p037_value_initial,
-    @p038_key, @p038, @p038_type, p038_value_initial,
-    @p039_key, @p039, @p039_type, p039_value_initial,
-    @p040_key, @p040, @p040_type, p040_value_initial,
-    @p041_key, @p041, @p041_type, p041_value_initial);
-
-LOAD DATA LOCAL INFILE 'data/blockprefixes.tsv'
-    INTO TABLE xcosblocks_blockprefixparameter
-    FIELDS TERMINATED BY '\t'
-    LINES TERMINATED BY '\n'
-    (blockprefix_id, @name, @tmp2, @tmp3,
-    @p000_key, p000, @p000_type, @p000_value_initial,
-    @p001_key, p001, @p001_type, @p001_value_initial,
-    @p002_key, p002, @p002_type, @p002_value_initial,
-    @p003_key, p003, @p003_type, @p003_value_initial,
-    @p004_key, p004, @p004_type, @p004_value_initial,
-    @p005_key, p005, @p005_type, @p005_value_initial,
-    @p006_key, p006, @p006_type, @p006_value_initial,
-    @p007_key, p007, @p007_type, @p007_value_initial,
-    @p008_key, p008, @p008_type, @p008_value_initial,
-    @p009_key, p009, @p009_type, @p009_value_initial,
-    @p010_key, p010, @p010_type, @p010_value_initial,
-    @p011_key, p011, @p011_type, @p011_value_initial,
-    @p012_key, p012, @p012_type, @p012_value_initial,
-    @p013_key, p013, @p013_type, @p013_value_initial,
-    @p014_key, p014, @p014_type, @p014_value_initial,
-    @p015_key, p015, @p015_type, @p015_value_initial,
-    @p016_key, p016, @p016_type, @p016_value_initial,
-    @p017_key, p017, @p017_type, @p017_value_initial,
-    @p018_key, p018, @p018_type, @p018_value_initial,
-    @p019_key, p019, @p019_type, @p019_value_initial,
-    @p020_key, p020, @p020_type, @p020_value_initial,
-    @p021_key, p021, @p021_type, @p021_value_initial,
-    @p022_key, p022, @p022_type, @p022_value_initial,
-    @p023_key, p023, @p023_type, @p023_value_initial,
-    @p024_key, p024, @p024_type, @p024_value_initial,
-    @p025_key, p025, @p025_type, @p025_value_initial,
-    @p026_key, p026, @p026_type, @p026_value_initial,
-    @p027_key, p027, @p027_type, @p027_value_initial,
-    @p028_key, p028, @p028_type, @p028_value_initial,
-    @p029_key, p029, @p029_type, @p029_value_initial,
-    @p030_key, p030, @p030_type, @p030_value_initial,
-    @p031_key, p031, @p031_type, @p031_value_initial,
-    @p032_key, p032, @p032_type, @p032_value_initial,
-    @p033_key, p033, @p033_type, @p033_value_initial,
-    @p034_key, p034, @p034_type, @p034_value_initial,
-    @p035_key, p035, @p035_type, @p035_value_initial,
-    @p036_key, p036, @p036_type, @p036_value_initial,
-    @p037_key, p037, @p037_type, @p037_value_initial,
-    @p038_key, p038, @p038_type, @p038_value_initial,
-    @p039_key, p039, @p039_type, @p039_value_initial,
-    @p040_key, p040, @p040_type, @p040_value_initial,
-    @p041_key, p041, @p041_type, @p041_value_initial)
-    SET
-    p000_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p000_type),
-    p001_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p001_type),
-    p002_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p002_type),
-    p003_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p003_type),
-    p004_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p004_type),
-    p005_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p005_type),
-    p006_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p006_type),
-    p007_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p007_type),
-    p008_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p008_type),
-    p009_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p009_type),
-    p010_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p010_type),
-    p011_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p011_type),
-    p012_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p012_type),
-    p013_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p013_type),
-    p014_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p014_type),
-    p015_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p015_type),
-    p016_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p016_type),
-    p017_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p017_type),
-    p018_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p018_type),
-    p019_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p019_type),
-    p020_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p020_type),
-    p021_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p021_type),
-    p022_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p022_type),
-    p023_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p023_type),
-    p024_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p024_type),
-    p025_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p025_type),
-    p026_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p026_type),
-    p027_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p027_type),
-    p028_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p028_type),
-    p029_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p029_type),
-    p030_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p030_type),
-    p031_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p031_type),
-    p032_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p032_type),
-    p033_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p033_type),
-    p034_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p034_type),
-    p035_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p035_type),
-    p036_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p036_type),
-    p037_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p037_type),
-    p038_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p038_type),
-    p039_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p039_type),
-    p040_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p040_type),
-    p041_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p041_type);
-
-LOAD DATA LOCAL INFILE 'data/main-category-blocks.tsv'
-    INTO TABLE xcosblocks_block
-    FIELDS TERMINATED BY '\t'
-    LINES TERMINATED BY '\n'
-    (id, @main_category_name, name, @blockprefix_name, initial_display_parameter,
-    @p000_key, @p000, @p000_type, p000_value_initial,
-    @p001_key, @p001, @p001_type, p001_value_initial,
-    @p002_key, @p002, @p002_type, p002_value_initial,
-    @p003_key, @p003, @p003_type, p003_value_initial,
-    @p004_key, @p004, @p004_type, p004_value_initial,
-    @p005_key, @p005, @p005_type, p005_value_initial,
-    @p006_key, @p006, @p006_type, p006_value_initial,
-    @p007_key, @p007, @p007_type, p007_value_initial,
-    @p008_key, @p008, @p008_type, p008_value_initial,
-    @p009_key, @p009, @p009_type, p009_value_initial,
-    @p010_key, @p010, @p010_type, p010_value_initial,
-    @p011_key, @p011, @p011_type, p011_value_initial,
-    @p012_key, @p012, @p012_type, p012_value_initial,
-    @p013_key, @p013, @p013_type, p013_value_initial,
-    @p014_key, @p014, @p014_type, p014_value_initial,
-    @p015_key, @p015, @p015_type, p015_value_initial,
-    @p016_key, @p016, @p016_type, p016_value_initial,
-    @p017_key, @p017, @p017_type, p017_value_initial,
-    @p018_key, @p018, @p018_type, p018_value_initial,
-    @p019_key, @p019, @p019_type, p019_value_initial,
-    @p020_key, @p020, @p020_type, p020_value_initial,
-    @p021_key, @p021, @p021_type, p021_value_initial,
-    @p022_key, @p022, @p022_type, p022_value_initial,
-    @p023_key, @p023, @p023_type, p023_value_initial,
-    @p024_key, @p024, @p024_type, p024_value_initial,
-    @p025_key, @p025, @p025_type, p025_value_initial,
-    @p026_key, @p026, @p026_type, p026_value_initial,
-    @p027_key, @p027, @p027_type, p027_value_initial,
-    @p028_key, @p028, @p028_type, p028_value_initial,
-    @p029_key, @p029, @p029_type, p029_value_initial,
-    @p030_key, @p030, @p030_type, p030_value_initial,
-    @p031_key, @p031, @p031_type, p031_value_initial,
-    @p032_key, @p032, @p032_type, p032_value_initial,
-    @p033_key, @p033, @p033_type, p033_value_initial,
-    @p034_key, @p034, @p034_type, p034_value_initial,
-    @p035_key, @p035, @p035_type, p035_value_initial,
-    @p036_key, @p036, @p036_type, p036_value_initial,
-    @p037_key, @p037, @p037_type, p037_value_initial,
-    @p038_key, @p038, @p038_type, p038_value_initial,
-    @p039_key, @p039, @p039_type, p039_value_initial,
-    @p040_key, @p040, @p040_type, p040_value_initial,
-    @p041_key, @p041, @p041_type, p041_value_initial)
-    SET block_width = 40,
-    block_height = 40,
-    blockprefix_id = (SELECT id FROM xcosblocks_blockprefix WHERE name = @blockprefix_name),
-    main_category_id = (SELECT id from xcosblocks_category WHERE blocktype_id = @blocktype_id AND name = @main_category_name);
-
-LOAD DATA LOCAL INFILE 'data/main-category-blocks.tsv'
-    INTO TABLE xcosblocks_blockparameter
-    FIELDS TERMINATED BY '\t'
-    LINES TERMINATED BY '\n'
-    (block_id, @main_category_name, @name, @blockprefix_name, @initial_display_parameter,
-    @p000_key, p000, @p000_type, @p000_value_initial,
-    @p001_key, p001, @p001_type, @p001_value_initial,
-    @p002_key, p002, @p002_type, @p002_value_initial,
-    @p003_key, p003, @p003_type, @p003_value_initial,
-    @p004_key, p004, @p004_type, @p004_value_initial,
-    @p005_key, p005, @p005_type, @p005_value_initial,
-    @p006_key, p006, @p006_type, @p006_value_initial,
-    @p007_key, p007, @p007_type, @p007_value_initial,
-    @p008_key, p008, @p008_type, @p008_value_initial,
-    @p009_key, p009, @p009_type, @p009_value_initial,
-    @p010_key, p010, @p010_type, @p010_value_initial,
-    @p011_key, p011, @p011_type, @p011_value_initial,
-    @p012_key, p012, @p012_type, @p012_value_initial,
-    @p013_key, p013, @p013_type, @p013_value_initial,
-    @p014_key, p014, @p014_type, @p014_value_initial,
-    @p015_key, p015, @p015_type, @p015_value_initial,
-    @p016_key, p016, @p016_type, @p016_value_initial,
-    @p017_key, p017, @p017_type, @p017_value_initial,
-    @p018_key, p018, @p018_type, @p018_value_initial,
-    @p019_key, p019, @p019_type, @p019_value_initial,
-    @p020_key, p020, @p020_type, @p020_value_initial,
-    @p021_key, p021, @p021_type, @p021_value_initial,
-    @p022_key, p022, @p022_type, @p022_value_initial,
-    @p023_key, p023, @p023_type, @p023_value_initial,
-    @p024_key, p024, @p024_type, @p024_value_initial,
-    @p025_key, p025, @p025_type, @p025_value_initial,
-    @p026_key, p026, @p026_type, @p026_value_initial,
-    @p027_key, p027, @p027_type, @p027_value_initial,
-    @p028_key, p028, @p028_type, @p028_value_initial,
-    @p029_key, p029, @p029_type, @p029_value_initial,
-    @p030_key, p030, @p030_type, @p030_value_initial,
-    @p031_key, p031, @p031_type, @p031_value_initial,
-    @p032_key, p032, @p032_type, @p032_value_initial,
-    @p033_key, p033, @p033_type, @p033_value_initial,
-    @p034_key, p034, @p034_type, @p034_value_initial,
-    @p035_key, p035, @p035_type, @p035_value_initial,
-    @p036_key, p036, @p036_type, @p036_value_initial,
-    @p037_key, p037, @p037_type, @p037_value_initial,
-    @p038_key, p038, @p038_type, @p038_value_initial,
-    @p039_key, p039, @p039_type, @p039_value_initial,
-    @p040_key, p040, @p040_type, @p040_value_initial,
-    @p041_key, p041, @p041_type, @p041_value_initial)
-    SET
-    p000_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p000_type),
-    p001_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p001_type),
-    p002_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p002_type),
-    p003_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p003_type),
-    p004_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p004_type),
-    p005_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p005_type),
-    p006_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p006_type),
-    p007_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p007_type),
-    p008_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p008_type),
-    p009_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p009_type),
-    p010_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p010_type),
-    p011_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p011_type),
-    p012_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p012_type),
-    p013_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p013_type),
-    p014_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p014_type),
-    p015_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p015_type),
-    p016_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p016_type),
-    p017_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p017_type),
-    p018_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p018_type),
-    p019_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p019_type),
-    p020_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p020_type),
-    p021_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p021_type),
-    p022_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p022_type),
-    p023_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p023_type),
-    p024_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p024_type),
-    p025_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p025_type),
-    p026_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p026_type),
-    p027_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p027_type),
-    p028_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p028_type),
-    p029_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p029_type),
-    p030_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p030_type),
-    p031_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p031_type),
-    p032_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p032_type),
-    p033_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p033_type),
-    p034_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p034_type),
-    p035_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p035_type),
-    p036_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p036_type),
-    p037_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p037_type),
-    p038_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p038_type),
-    p039_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p039_type),
-    p040_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p040_type),
-    p041_type_id = (SELECT id FROM xcosblocks_parameterdatatype WHERE name = @p041_type);
-
-LOAD DATA LOCAL INFILE 'data/categories-blocks.tsv'
-    INTO TABLE xcosblocks_block_categories
-    FIELDS TERMINATED BY '\t'
-    LINES TERMINATED BY '\n'
-    (id, @category_name, @main_category_name, @block_name)
-    SET block_id = (SELECT xcosblocks_block.id FROM xcosblocks_block JOIN xcosblocks_category ON main_category_id = xcosblocks_category.id WHERE xcosblocks_block.name = @block_name AND blocktype_id = @blocktype_id AND xcosblocks_category.name = @main_category_name),
-    category_id = (SELECT id from xcosblocks_category WHERE blocktype_id = @blocktype_id AND name = @category_name);
-
-LOAD DATA LOCAL INFILE 'data/blocks-ports.tsv'
-    INTO TABLE xcosblocks_blockport
-    FIELDS TERMINATED BY '\t'
-    LINES TERMINATED BY '\n'
-    (id, @main_category_name, @block_name, port_order, port_name, port_number, port_x, port_y, port_orientation, port_part, port_dmg, port_type)
-    SET block_id = (SELECT xcosblocks_block.id FROM xcosblocks_block JOIN xcosblocks_category ON main_category_id = xcosblocks_category.id WHERE xcosblocks_block.name = @block_name AND blocktype_id = @blocktype_id AND xcosblocks_category.name = @main_category_name);
-
-CREATE TEMPORARY TABLE tmp_xcosblocks_block (
-    id int NOT NULL PRIMARY KEY,
-    block_width int NOT NULL,
-    block_height int NOT NULL
-);
-
-LOAD DATA LOCAL INFILE 'data/getsize.tsv'
-    INTO TABLE tmp_xcosblocks_block
-    FIELDS TERMINATED BY '\t'
-    LINES TERMINATED BY '\n'
-    (@main_category_name, @block_name, block_width, block_height)
-    SET id = (SELECT xcosblocks_block.id FROM xcosblocks_block JOIN xcosblocks_category ON main_category_id = xcosblocks_category.id WHERE xcosblocks_block.name = @block_name AND blocktype_id = @blocktype_id AND xcosblocks_category.name = @main_category_name);
-
-DELETE FROM xcosblocks_blockprefixparameter
-    WHERE (p000 IS NULL OR p000 = '') AND
-    (p001 IS NULL OR p001 = '') AND
-    (p002 IS NULL OR p002 = '') AND
-    (p003 IS NULL OR p003 = '') AND
-    (p004 IS NULL OR p004 = '') AND
-    (p005 IS NULL OR p005 = '') AND
-    (p006 IS NULL OR p006 = '') AND
-    (p007 IS NULL OR p007 = '') AND
-    (p008 IS NULL OR p008 = '') AND
-    (p009 IS NULL OR p009 = '') AND
-    (p010 IS NULL OR p010 = '') AND
-    (p011 IS NULL OR p011 = '') AND
-    (p012 IS NULL OR p012 = '') AND
-    (p013 IS NULL OR p013 = '') AND
-    (p014 IS NULL OR p014 = '') AND
-    (p015 IS NULL OR p015 = '') AND
-    (p016 IS NULL OR p016 = '') AND
-    (p017 IS NULL OR p017 = '') AND
-    (p018 IS NULL OR p018 = '') AND
-    (p019 IS NULL OR p019 = '') AND
-    (p020 IS NULL OR p020 = '') AND
-    (p021 IS NULL OR p021 = '') AND
-    (p022 IS NULL OR p022 = '') AND
-    (p023 IS NULL OR p023 = '') AND
-    (p024 IS NULL OR p024 = '') AND
-    (p025 IS NULL OR p025 = '') AND
-    (p026 IS NULL OR p026 = '') AND
-    (p027 IS NULL OR p027 = '') AND
-    (p028 IS NULL OR p028 = '') AND
-    (p029 IS NULL OR p029 = '') AND
-    (p030 IS NULL OR p030 = '') AND
-    (p031 IS NULL OR p031 = '') AND
-    (p032 IS NULL OR p032 = '') AND
-    (p033 IS NULL OR p033 = '') AND
-    (p034 IS NULL OR p034 = '') AND
-    (p035 IS NULL OR p035 = '') AND
-    (p036 IS NULL OR p036 = '') AND
-    (p037 IS NULL OR p037 = '') AND
-    (p038 IS NULL OR p038 = '') AND
-    (p039 IS NULL OR p039 = '') AND
-    (p040 IS NULL OR p040 = '') AND
-    (p041 IS NULL OR p041 = '') AND
-    (p042 IS NULL OR p042 = '') AND
-    (p043 IS NULL OR p043 = '') AND
-    (p044 IS NULL OR p044 = '') AND
-    (p045 IS NULL OR p045 = '') AND
-    (p046 IS NULL OR p046 = '') AND
-    (p047 IS NULL OR p047 = '') AND
-    (p048 IS NULL OR p048 = '') AND
-    (p049 IS NULL OR p049 = '') AND
-    (p050 IS NULL OR p050 = '') AND
-    (p051 IS NULL OR p051 = '') AND
-    (p052 IS NULL OR p052 = '') AND
-    (p053 IS NULL OR p053 = '') AND
-    (p054 IS NULL OR p054 = '') AND
-    (p055 IS NULL OR p055 = '') AND
-    (p056 IS NULL OR p056 = '') AND
-    (p057 IS NULL OR p057 = '') AND
-    (p058 IS NULL OR p058 = '') AND
-    (p059 IS NULL OR p059 = '');
-
-DELETE FROM xcosblocks_blockparameter
-    WHERE (p000 IS NULL OR p000 = '') AND
-    (p001 IS NULL OR p001 = '') AND
-    (p002 IS NULL OR p002 = '') AND
-    (p003 IS NULL OR p003 = '') AND
-    (p004 IS NULL OR p004 = '') AND
-    (p005 IS NULL OR p005 = '') AND
-    (p006 IS NULL OR p006 = '') AND
-    (p007 IS NULL OR p007 = '') AND
-    (p008 IS NULL OR p008 = '') AND
-    (p009 IS NULL OR p009 = '') AND
-    (p010 IS NULL OR p010 = '') AND
-    (p011 IS NULL OR p011 = '') AND
-    (p012 IS NULL OR p012 = '') AND
-    (p013 IS NULL OR p013 = '') AND
-    (p014 IS NULL OR p014 = '') AND
-    (p015 IS NULL OR p015 = '') AND
-    (p016 IS NULL OR p016 = '') AND
-    (p017 IS NULL OR p017 = '') AND
-    (p018 IS NULL OR p018 = '') AND
-    (p019 IS NULL OR p019 = '') AND
-    (p020 IS NULL OR p020 = '') AND
-    (p021 IS NULL OR p021 = '') AND
-    (p022 IS NULL OR p022 = '') AND
-    (p023 IS NULL OR p023 = '') AND
-    (p024 IS NULL OR p024 = '') AND
-    (p025 IS NULL OR p025 = '') AND
-    (p026 IS NULL OR p026 = '') AND
-    (p027 IS NULL OR p027 = '') AND
-    (p028 IS NULL OR p028 = '') AND
-    (p029 IS NULL OR p029 = '') AND
-    (p030 IS NULL OR p030 = '') AND
-    (p031 IS NULL OR p031 = '') AND
-    (p032 IS NULL OR p032 = '') AND
-    (p033 IS NULL OR p033 = '') AND
-    (p034 IS NULL OR p034 = '') AND
-    (p035 IS NULL OR p035 = '') AND
-    (p036 IS NULL OR p036 = '') AND
-    (p037 IS NULL OR p037 = '') AND
-    (p038 IS NULL OR p038 = '') AND
-    (p039 IS NULL OR p039 = '') AND
-    (p040 IS NULL OR p040 = '') AND
-    (p041 IS NULL OR p041 = '') AND
-    (p042 IS NULL OR p042 = '') AND
-    (p043 IS NULL OR p043 = '') AND
-    (p044 IS NULL OR p044 = '') AND
-    (p045 IS NULL OR p045 = '') AND
-    (p046 IS NULL OR p046 = '') AND
-    (p047 IS NULL OR p047 = '') AND
-    (p048 IS NULL OR p048 = '') AND
-    (p049 IS NULL OR p049 = '') AND
-    (p050 IS NULL OR p050 = '') AND
-    (p051 IS NULL OR p051 = '') AND
-    (p052 IS NULL OR p052 = '') AND
-    (p053 IS NULL OR p053 = '') AND
-    (p054 IS NULL OR p054 = '') AND
-    (p055 IS NULL OR p055 = '') AND
-    (p056 IS NULL OR p056 = '') AND
-    (p057 IS NULL OR p057 = '') AND
-    (p058 IS NULL OR p058 = '') AND
-    (p059 IS NULL OR p059 = '');
-
-UPDATE xcosblocks_block B
-    JOIN xcosblocks_blockprefix BP ON BP.id = B.blockprefix_id
-    JOIN xcosblocks_category C ON C.id = B.main_category_id
-    SET B.block_name = B.name,
-    B.block_image_path = CONCAT('palettes/', B.name, '.png');
-
-UPDATE xcosblocks_block B
-    JOIN tmp_xcosblocks_block TB ON TB.id = B.id
-    SET B.block_width = TB.block_width,
-    B.block_height = TB.block_height;
-
-UPDATE xcosblocks_block B
-    JOIN xcosblocks_blockprefix BPR ON BPR.id = B.blockprefix_id
-    SET B.p000_value_initial = BPR.p000_value_initial,
-    B.p001_value_initial = BPR.p001_value_initial,
-    B.p002_value_initial = BPR.p002_value_initial,
-    B.p003_value_initial = BPR.p003_value_initial,
-    B.p004_value_initial = BPR.p004_value_initial,
-    B.p005_value_initial = BPR.p005_value_initial,
-    B.p006_value_initial = BPR.p006_value_initial,
-    B.p007_value_initial = BPR.p007_value_initial,
-    B.p008_value_initial = BPR.p008_value_initial,
-    B.p009_value_initial = BPR.p009_value_initial,
-    B.p010_value_initial = BPR.p010_value_initial,
-    B.p011_value_initial = BPR.p011_value_initial,
-    B.p012_value_initial = BPR.p012_value_initial,
-    B.p013_value_initial = BPR.p013_value_initial,
-    B.p014_value_initial = BPR.p014_value_initial,
-    B.p015_value_initial = BPR.p015_value_initial,
-    B.p016_value_initial = BPR.p016_value_initial,
-    B.p017_value_initial = BPR.p017_value_initial,
-    B.p018_value_initial = BPR.p018_value_initial,
-    B.p019_value_initial = BPR.p019_value_initial,
-    B.p020_value_initial = BPR.p020_value_initial,
-    B.p021_value_initial = BPR.p021_value_initial,
-    B.p022_value_initial = BPR.p022_value_initial,
-    B.p023_value_initial = BPR.p023_value_initial,
-    B.p024_value_initial = BPR.p024_value_initial,
-    B.p025_value_initial = BPR.p025_value_initial,
-    B.p026_value_initial = BPR.p026_value_initial,
-    B.p027_value_initial = BPR.p027_value_initial,
-    B.p028_value_initial = BPR.p028_value_initial,
-    B.p029_value_initial = BPR.p029_value_initial,
-    B.p030_value_initial = BPR.p030_value_initial,
-    B.p031_value_initial = BPR.p031_value_initial,
-    B.p032_value_initial = BPR.p032_value_initial,
-    B.p033_value_initial = BPR.p033_value_initial,
-    B.p034_value_initial = BPR.p034_value_initial,
-    B.p035_value_initial = BPR.p035_value_initial,
-    B.p036_value_initial = BPR.p036_value_initial,
-    B.p037_value_initial = BPR.p037_value_initial,
-    B.p038_value_initial = BPR.p038_value_initial,
-    B.p039_value_initial = BPR.p039_value_initial,
-    B.p040_value_initial = BPR.p040_value_initial,
-    B.p041_value_initial = BPR.p041_value_initial,
-    B.p042_value_initial = BPR.p042_value_initial,
-    B.p043_value_initial = BPR.p043_value_initial,
-    B.p044_value_initial = BPR.p044_value_initial,
-    B.p045_value_initial = BPR.p045_value_initial,
-    B.p046_value_initial = BPR.p046_value_initial,
-    B.p047_value_initial = BPR.p047_value_initial,
-    B.p048_value_initial = BPR.p048_value_initial,
-    B.p049_value_initial = BPR.p049_value_initial,
-    B.p050_value_initial = BPR.p050_value_initial,
-    B.p051_value_initial = BPR.p051_value_initial,
-    B.p052_value_initial = BPR.p052_value_initial,
-    B.p053_value_initial = BPR.p053_value_initial,
-    B.p054_value_initial = BPR.p054_value_initial,
-    B.p055_value_initial = BPR.p055_value_initial,
-    B.p056_value_initial = BPR.p056_value_initial,
-    B.p057_value_initial = BPR.p057_value_initial,
-    B.p058_value_initial = BPR.p058_value_initial,
-    B.p059_value_initial = BPR.p059_value_initial
-    WHERE (BPR.p000_value_initial IS NOT NULL AND BPR.p000_value_initial != '') OR
-    (BPR.p001_value_initial IS NOT NULL AND BPR.p001_value_initial != '') OR
-    (BPR.p002_value_initial IS NOT NULL AND BPR.p002_value_initial != '') OR
-    (BPR.p003_value_initial IS NOT NULL AND BPR.p003_value_initial != '') OR
-    (BPR.p004_value_initial IS NOT NULL AND BPR.p004_value_initial != '') OR
-    (BPR.p005_value_initial IS NOT NULL AND BPR.p005_value_initial != '') OR
-    (BPR.p006_value_initial IS NOT NULL AND BPR.p006_value_initial != '') OR
-    (BPR.p007_value_initial IS NOT NULL AND BPR.p007_value_initial != '') OR
-    (BPR.p008_value_initial IS NOT NULL AND BPR.p008_value_initial != '') OR
-    (BPR.p009_value_initial IS NOT NULL AND BPR.p009_value_initial != '') OR
-    (BPR.p010_value_initial IS NOT NULL AND BPR.p010_value_initial != '') OR
-    (BPR.p011_value_initial IS NOT NULL AND BPR.p011_value_initial != '') OR
-    (BPR.p012_value_initial IS NOT NULL AND BPR.p012_value_initial != '') OR
-    (BPR.p013_value_initial IS NOT NULL AND BPR.p013_value_initial != '') OR
-    (BPR.p014_value_initial IS NOT NULL AND BPR.p014_value_initial != '') OR
-    (BPR.p015_value_initial IS NOT NULL AND BPR.p015_value_initial != '') OR
-    (BPR.p016_value_initial IS NOT NULL AND BPR.p016_value_initial != '') OR
-    (BPR.p017_value_initial IS NOT NULL AND BPR.p017_value_initial != '') OR
-    (BPR.p018_value_initial IS NOT NULL AND BPR.p018_value_initial != '') OR
-    (BPR.p019_value_initial IS NOT NULL AND BPR.p019_value_initial != '') OR
-    (BPR.p020_value_initial IS NOT NULL AND BPR.p020_value_initial != '') OR
-    (BPR.p021_value_initial IS NOT NULL AND BPR.p021_value_initial != '') OR
-    (BPR.p022_value_initial IS NOT NULL AND BPR.p022_value_initial != '') OR
-    (BPR.p023_value_initial IS NOT NULL AND BPR.p023_value_initial != '') OR
-    (BPR.p024_value_initial IS NOT NULL AND BPR.p024_value_initial != '') OR
-    (BPR.p025_value_initial IS NOT NULL AND BPR.p025_value_initial != '') OR
-    (BPR.p026_value_initial IS NOT NULL AND BPR.p026_value_initial != '') OR
-    (BPR.p027_value_initial IS NOT NULL AND BPR.p027_value_initial != '') OR
-    (BPR.p028_value_initial IS NOT NULL AND BPR.p028_value_initial != '') OR
-    (BPR.p029_value_initial IS NOT NULL AND BPR.p029_value_initial != '') OR
-    (BPR.p030_value_initial IS NOT NULL AND BPR.p030_value_initial != '') OR
-    (BPR.p031_value_initial IS NOT NULL AND BPR.p031_value_initial != '') OR
-    (BPR.p032_value_initial IS NOT NULL AND BPR.p032_value_initial != '') OR
-    (BPR.p033_value_initial IS NOT NULL AND BPR.p033_value_initial != '') OR
-    (BPR.p034_value_initial IS NOT NULL AND BPR.p034_value_initial != '') OR
-    (BPR.p035_value_initial IS NOT NULL AND BPR.p035_value_initial != '') OR
-    (BPR.p036_value_initial IS NOT NULL AND BPR.p036_value_initial != '') OR
-    (BPR.p037_value_initial IS NOT NULL AND BPR.p037_value_initial != '') OR
-    (BPR.p038_value_initial IS NOT NULL AND BPR.p038_value_initial != '') OR
-    (BPR.p039_value_initial IS NOT NULL AND BPR.p039_value_initial != '') OR
-    (BPR.p040_value_initial IS NOT NULL AND BPR.p040_value_initial != '') OR
-    (BPR.p041_value_initial IS NOT NULL AND BPR.p041_value_initial != '') OR
-    (BPR.p042_value_initial IS NOT NULL AND BPR.p042_value_initial != '') OR
-    (BPR.p043_value_initial IS NOT NULL AND BPR.p043_value_initial != '') OR
-    (BPR.p044_value_initial IS NOT NULL AND BPR.p044_value_initial != '') OR
-    (BPR.p045_value_initial IS NOT NULL AND BPR.p045_value_initial != '') OR
-    (BPR.p046_value_initial IS NOT NULL AND BPR.p046_value_initial != '') OR
-    (BPR.p047_value_initial IS NOT NULL AND BPR.p047_value_initial != '') OR
-    (BPR.p048_value_initial IS NOT NULL AND BPR.p048_value_initial != '') OR
-    (BPR.p049_value_initial IS NOT NULL AND BPR.p049_value_initial != '') OR
-    (BPR.p050_value_initial IS NOT NULL AND BPR.p050_value_initial != '') OR
-    (BPR.p051_value_initial IS NOT NULL AND BPR.p051_value_initial != '') OR
-    (BPR.p052_value_initial IS NOT NULL AND BPR.p052_value_initial != '') OR
-    (BPR.p053_value_initial IS NOT NULL AND BPR.p053_value_initial != '') OR
-    (BPR.p054_value_initial IS NOT NULL AND BPR.p054_value_initial != '') OR
-    (BPR.p055_value_initial IS NOT NULL AND BPR.p055_value_initial != '') OR
-    (BPR.p056_value_initial IS NOT NULL AND BPR.p056_value_initial != '') OR
-    (BPR.p057_value_initial IS NOT NULL AND BPR.p057_value_initial != '') OR
-    (BPR.p058_value_initial IS NOT NULL AND BPR.p058_value_initial != '') OR
-    (BPR.p059_value_initial IS NOT NULL AND BPR.p059_value_initial != '');
-
-INSERT INTO xcosblocks_blockparameter (block_id,
-    p000, p000_type_id, p001, p001_type_id, p002, p002_type_id, p003, p003_type_id,
-    p004, p004_type_id, p005, p005_type_id, p006, p006_type_id, p007, p007_type_id,
-    p008, p008_type_id, p009, p009_type_id, p010, p010_type_id, p011, p011_type_id,
-    p012, p012_type_id, p013, p013_type_id, p014, p014_type_id, p015, p015_type_id,
-    p016, p016_type_id, p017, p017_type_id, p018, p018_type_id, p019, p019_type_id,
-    p020, p020_type_id, p021, p021_type_id, p022, p022_type_id, p023, p023_type_id,
-    p024, p024_type_id, p025, p025_type_id, p026, p026_type_id, p027, p027_type_id,
-    p028, p028_type_id, p029, p029_type_id, p030, p030_type_id, p031, p031_type_id,
-    p032, p032_type_id, p033, p033_type_id, p034, p034_type_id, p035, p035_type_id,
-    p036, p036_type_id, p037, p037_type_id, p038, p038_type_id, p039, p039_type_id,
-    p040, p040_type_id, p041, p041_type_id, p042, p042_type_id, p043, p043_type_id,
-    p044, p044_type_id, p045, p045_type_id, p046, p046_type_id, p047, p047_type_id,
-    p048, p048_type_id, p049, p049_type_id, p050, p050_type_id, p051, p051_type_id,
-    p052, p052_type_id, p053, p053_type_id, p054, p054_type_id, p055, p055_type_id,
-    p056, p056_type_id, p057, p057_type_id, p058, p058_type_id, p059, p059_type_id)
-    SELECT B.id,
-    BPRPA.p000, BPRPA.p000_type_id, BPRPA.p001, BPRPA.p001_type_id, BPRPA.p002, BPRPA.p002_type_id, BPRPA.p003, BPRPA.p003_type_id,
-    BPRPA.p004, BPRPA.p004_type_id, BPRPA.p005, BPRPA.p005_type_id, BPRPA.p006, BPRPA.p006_type_id, BPRPA.p007, BPRPA.p007_type_id,
-    BPRPA.p008, BPRPA.p008_type_id, BPRPA.p009, BPRPA.p009_type_id, BPRPA.p010, BPRPA.p010_type_id, BPRPA.p011, BPRPA.p011_type_id,
-    BPRPA.p012, BPRPA.p012_type_id, BPRPA.p013, BPRPA.p013_type_id, BPRPA.p014, BPRPA.p014_type_id, BPRPA.p015, BPRPA.p015_type_id,
-    BPRPA.p016, BPRPA.p016_type_id, BPRPA.p017, BPRPA.p017_type_id, BPRPA.p018, BPRPA.p018_type_id, BPRPA.p019, BPRPA.p019_type_id,
-    BPRPA.p020, BPRPA.p020_type_id, BPRPA.p021, BPRPA.p021_type_id, BPRPA.p022, BPRPA.p022_type_id, BPRPA.p023, BPRPA.p023_type_id,
-    BPRPA.p024, BPRPA.p024_type_id, BPRPA.p025, BPRPA.p025_type_id, BPRPA.p026, BPRPA.p026_type_id, BPRPA.p027, BPRPA.p027_type_id,
-    BPRPA.p028, BPRPA.p028_type_id, BPRPA.p029, BPRPA.p029_type_id, BPRPA.p030, BPRPA.p030_type_id, BPRPA.p031, BPRPA.p031_type_id,
-    BPRPA.p032, BPRPA.p032_type_id, BPRPA.p033, BPRPA.p033_type_id, BPRPA.p034, BPRPA.p034_type_id, BPRPA.p035, BPRPA.p035_type_id,
-    BPRPA.p036, BPRPA.p036_type_id, BPRPA.p037, BPRPA.p037_type_id, BPRPA.p038, BPRPA.p038_type_id, BPRPA.p039, BPRPA.p039_type_id,
-    BPRPA.p040, BPRPA.p040_type_id, BPRPA.p041, BPRPA.p041_type_id, BPRPA.p042, BPRPA.p042_type_id, BPRPA.p043, BPRPA.p043_type_id,
-    BPRPA.p044, BPRPA.p044_type_id, BPRPA.p045, BPRPA.p045_type_id, BPRPA.p046, BPRPA.p046_type_id, BPRPA.p047, BPRPA.p047_type_id,
-    BPRPA.p048, BPRPA.p048_type_id, BPRPA.p049, BPRPA.p049_type_id, BPRPA.p050, BPRPA.p050_type_id, BPRPA.p051, BPRPA.p051_type_id,
-    BPRPA.p052, BPRPA.p052_type_id, BPRPA.p053, BPRPA.p053_type_id, BPRPA.p054, BPRPA.p054_type_id, BPRPA.p055, BPRPA.p055_type_id,
-    BPRPA.p056, BPRPA.p056_type_id, BPRPA.p057, BPRPA.p057_type_id, BPRPA.p058, BPRPA.p058_type_id, BPRPA.p059, BPRPA.p059_type_id
-    FROM xcosblocks_block B
-    JOIN xcosblocks_blockprefixparameter BPRPA ON BPRPA.blockprefix_id = B.blockprefix_id;
diff --git a/screening_task.txt b/screening_task.txt
deleted file mode 100644
index 3c301cbf..00000000
--- a/screening_task.txt
+++ /dev/null
@@ -1,161 +0,0 @@
-Task 1: React
-
-Make an output page containing charts each having data.
-
-Connect to https://xcosblocks.fossee.org/api/instructions/get to start
-receiving events looking like this:
-
-=========================================================================
-event: instruction
-data: addChart id=1 type=bar xMin=0 xMax=10 yMin=-30 yMax=30
-
-event: instruction
-data: addChart id=2 type=curve xMin=0 xMax=20 yMin=-10 yMax=10
-
-event: instruction
-data: addData id=1 x=2 y=6
-
-event: instruction
-data: addData id=2 x=3 y=1
-
-event: instruction
-data: reset
-
-event: instruction
-data: addChart id=1 type=curve xMin=0 xMax=10 yMin=-30 yMax=30
-
-event: done
-data: none
-
-=========================================================================
-
-Note that there may be a delay between two successive events. Order of events is
-important. You have to receive and process one event at a time.
-
-Depending on the events received, take the following actions:
-
-1. event: instruction
-
-The instruction event will be of three types of data. Depending on the data
-received, take the following actions:
-
-                                                             # Comments
-data: addChart id=uniqueId type=chartType other-parameters   # add (render) a chart to the page
-data: addData id=chartId other-parameters                    # add (render) a point to that chart
-data: reset                                                  # clear the page. remove all added charts
-
-Once the event is completed, wait for the next event.
-
-2. event: done
-
-Ignore the data. Close the connection.
-
-Endpoint: /api/instructions/get
-
-GET / POST parameters: (none)
-
-Output: An eventstream which gives a series of instructions
-
-Example of output:
-
-                                                                 # Comments
-                                                                 #
-                                                                 # There will be a blank page at start.
-event: instruction                                               #
-data: addChart id=7 type=bar xMin=0 xMax=10 yMin=-30 yMax=30     #
-                                                                 # Add 1st chart to page. It will occupy the full width.
-event: instruction                                               #
-data: addChart id=9 type=chart xMin=-10 xMax=10 yMin=-30 yMax=30 #
-                                                                 # Add 2nd chart to page. It will occupy the full width.
-                                                                 # It will be below the 1st chart.
-event: instruction                                               #
-data: reset                                                      #
-                                                                 # Remove all charts from the page. Forget all previous
-                                                                 # ids.
-event: instruction                                               #
-data: addChart id=3 type=bar xMin=0 xMax=10 yMin=-30 yMax=30     #
-                                                                 # Add 1st chart to page. It will occupy the full width.
-event: instruction                                               #
-data: addChart id=7 type=chart xMin=-10 xMax=10 yMin=-30 yMax=30 #
-                                                                 # Add 2nd chart to page. It will occupy the full width.
-                                                                 # It will be below the 1st chart.
-event: instruction                                               #
-data: addChart id=1 type=chart xMin=0 xMax=5 yMin=-20 yMax=20    #
-                                                                 # Add 3rd chart to page. It will occupy the full width.
-                                                                 # It will be below the 2nd chart.
-event: instruction                                               #
-data: addData id=3 x=0 y=10                                      #
-                                                                 # Add point to the 1st chart.
-event: instruction                                               #
-data: addData id=1 x=0 y=-5                                      #
-                                                                 # Add point to the 3rd chart.
-event: instruction                                               #
-data: addData id=3 x=1 y=-5                                      #
-                                                                 # Add another point to the 1st chart.
-event: instruction                                               #
-data: addData id=3 x=2 y=5                                       #
-                                                                 # Add another point to the 1st chart.
-event: instruction                                               #
-data: addData id=7 x=2 y=5                                       #
-                                                                 # Add point to the 2nd chart.
-event: instruction                                               #
-data: addData id=7 x=3 y=16                                      #
-                                                                 # Add another point to the 2nd chart.
-event: instruction                                               #
-event: done                                                      #
-data:                                                            #
-                                                                 # Close the connection here. Do not reset the page. So,
-                                                                 # the final page will have 3 charts containing a total
-                                                                 # of 6 points.
-
-
-Bonus tasks:
-
-1.
-
-Add 1st chart (as before)
-
-|        Chart 1        |          # Add first chart of full width
-
-Add 2nd chart in same row
-
-|  Chart 1  |  Chart 2  |          # Each chart will be 50% of page width
-
-When 3th chart is to be added, change to 2-row layout.
-
-|  Chart 1  |  Chart 2  |          #
-|        Chart 3        |          # Add third chart of full width on 2nd row
-
-|  Chart 1  |  Chart 2  |          #
-|  Chart 3  |  Chart 4  |          # Each chart will be 50% of page width
-
-When 5th chart is to be added, change to 3-row layout.
-
-|  Chart 1  |  Chart 2  |          #
-|  Chart 3  |  Chart 4  |          #
-|        Chart 5        |          # Add fifth chart of full width on 3nd row
-
-2.
-
-Add error logging. Errors can be of the following types:
-
-Unsupported event
-
-Unsupported instruction (for instruction event)
-
-For addChart instruction:
-
-id is missing or empty
-id is duplicate (since last reset)
-type is missing or empty
-type is unsupported
-mandatory parameter (based on type) is missing
-
-For addData instruction:
-
-id is missing or empty
-id does not exist
-mandatory parameter (based on type) is missing
-
-Note: the error event must be logged and ignored. Processing of the next event
-must continue.
diff --git a/scripts/blocks-ports-old.sql b/scripts/blocks-ports-old.sql
deleted file mode 100644
index 8bea4e72..00000000
--- a/scripts/blocks-ports-old.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-select XC.name CN, XB.name BN, initial_explicit_input_ports EI, initial_implicit_input_ports II, initial_explicit_output_ports EO, initial_implicit_output_ports IO, initial_command_ports CM, initial_control_ports CN, block_width BW, block_height BH
-    from xcosblocks_block XB
-    join xcosblocks_category XC on XC.id = main_category_id
-    order by XB.id;
diff --git a/inittable-port.sql b/scripts/inittable-port.sql
index 5d1698f3..5d1698f3 100644
--- a/inittable-port.sql
+++ b/scripts/inittable-port.sql
diff --git a/scripts/pinscript.sh b/scripts/pinscript.sh
index 95f365c4..348f59cd 100755
--- a/scripts/pinscript.sh
+++ b/scripts/pinscript.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-./scripts/pinscript.awk scripts/blocks-ports-old.tsv
+./scripts/pinscript.awk data/blocks-ports-old.tsv
diff --git a/scripts/unique.sh b/scripts/unique.sh
index b23a83aa..c49d81fb 100755
--- a/scripts/unique.sh
+++ b/scripts/unique.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-./scripts/unique.awk scripts/data-categories-blocks.tsv
+./scripts/unique.awk data/data-categories-blocks.tsv