diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/SchemaMigration.kt b/node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/SchemaMigration.kt
index 436d7bd7ea..b78748b3da 100644
--- a/node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/SchemaMigration.kt
+++ b/node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/SchemaMigration.kt
@@ -162,10 +162,6 @@ class SchemaMigration(
             if (schemas.any { schema -> schema.migrationResource == "notary-raft.changelog-master" })
                 preV4Baseline.addAll(listOf("migration/notary-raft.changelog-init.xml",
                         "migration/notary-raft.changelog-v1.xml"))
-
-            if (schemas.any { schema -> schema.migrationResource == "notary-bft-smart.changelog-master" })
-                preV4Baseline.addAll(listOf("migration/notary-bft-smart.changelog-init.xml",
-                        "migration/notary-bft-smart.changelog-v1.xml"))
         }
         if (isFinanceAppWithLiquibaseNotMigrated) {
             preV4Baseline.addAll(listOf("migration/cash.changelog-init.xml",
diff --git a/node/src/main/resources/migration/node-core.changelog-master.xml b/node/src/main/resources/migration/node-core.changelog-master.xml
index d675e84c88..bb852326c2 100644
--- a/node/src/main/resources/migration/node-core.changelog-master.xml
+++ b/node/src/main/resources/migration/node-core.changelog-master.xml
@@ -1,7 +1,8 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
 
     <include file="migration/node-core.changelog-init.xml"/>
     <include file="migration/node-core.changelog-v3.xml"/>
diff --git a/node/src/main/resources/migration/node-notary.changelog-init.xml b/node/src/main/resources/migration/node-notary.changelog-init.xml
index 77f918bb92..7bb5a20c52 100644
--- a/node/src/main/resources/migration/node-notary.changelog-init.xml
+++ b/node/src/main/resources/migration/node-notary.changelog-init.xml
@@ -44,4 +44,4 @@
         <addPrimaryKey columnNames="id" constraintName="node_notary_request_log_pkey"
                        tableName="node_notary_request_log"/>
     </changeSet>
-</databaseChangeLog>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/node/src/main/resources/migration/node-notary.changelog-master.xml b/node/src/main/resources/migration/node-notary.changelog-master.xml
index d8a5a61b8c..6ebd2c54ce 100644
--- a/node/src/main/resources/migration/node-notary.changelog-master.xml
+++ b/node/src/main/resources/migration/node-notary.changelog-master.xml
@@ -5,8 +5,8 @@
                    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
 
     <include file="migration/node-notary.changelog-init.xml"/>
+
     <include file="migration/node-notary.changelog-v1.xml"/>
-    <include file="migration/node-notary.changelog-v2.xml"/>
     <include file="migration/node-notary.changelog-pkey.xml"/>
     <include file="migration/node-notary.changelog-committed-transactions-table.xml" />
 
diff --git a/node/src/main/resources/migration/node-notary.changelog-v2.xml b/node/src/main/resources/migration/node-notary.changelog-v2.xml
deleted file mode 100644
index 4c2adec29d..0000000000
--- a/node/src/main/resources/migration/node-notary.changelog-v2.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-                       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                       xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
-    <changeSet author="R3.Corda" id="rename-table-notary-commit-log">
-        <preConditions onFail="MARK_RAN">
-            <tableExists tableName="node_notary_commit_log"/>
-        </preConditions>
-        <renameTable oldTableName="node_notary_commit_log"  newTableName="node_notary_committed_states" />
-    </changeSet>
-    <changeSet author="R3.Corda" id="create-notary-request-log-table">
-        <preConditions onFail="MARK_RAN">
-            <not>
-                <tableExists tableName="node_notary_request_log"/>
-            </not>
-        </preConditions>
-        <createTable tableName="node_notary_request_log">
-            <column name="id" type="INT">
-                <constraints nullable="false"/>
-            </column>
-            <column name="consuming_transaction_id" type="NVARCHAR(64)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="requesting_party_name" type="NVARCHAR(255)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="request_timestamp" type="TIMESTAMP">
-                <constraints nullable="false"/>
-            </column>
-            <column name="request_signature" type="BLOB">
-                <constraints nullable="false"/>
-            </column>
-        </createTable>
-        <addPrimaryKey columnNames="id" constraintName="node_notary_request_log_pkey"
-                       tableName="node_notary_request_log"/>
-    </changeSet>
-</databaseChangeLog>
diff --git a/node/src/main/resources/migration/vault-schema.changelog-master.xml b/node/src/main/resources/migration/vault-schema.changelog-master.xml
index e934760df8..3fd168bea7 100644
--- a/node/src/main/resources/migration/vault-schema.changelog-master.xml
+++ b/node/src/main/resources/migration/vault-schema.changelog-master.xml
@@ -1,7 +1,8 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
 
     <include file="migration/vault-schema.changelog-init.xml"/>
     <include file="migration/vault-schema.changelog-v3.xml"/>
diff --git a/node/src/main/resources/migration/vault-schema.changelog-v7.xml b/node/src/main/resources/migration/vault-schema.changelog-v7.xml
index ba5e86e127..5b85396391 100644
--- a/node/src/main/resources/migration/vault-schema.changelog-v7.xml
+++ b/node/src/main/resources/migration/vault-schema.changelog-v7.xml
@@ -5,4 +5,4 @@
     <changeSet author="R3.Corda" id="make_issuer_ref_nullable">
         <dropNotNullConstraint columnDataType="varbinary(512)" columnName="issuer_ref" tableName="vault_fungible_states"/>
     </changeSet>
-</databaseChangeLog>
\ No newline at end of file
+</databaseChangeLog>