diff --git a/.gitignore b/.gitignore
index c62f1e01..c020d49c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@
 /.classpath
 /.project
 /log4j2-test.properties
+/.mvn.classpath
+/notes*
diff --git a/lib/org/hsqldb/hsqldb/maven-metadata.xml b/lib/org/hsqldb/hsqldb/maven-metadata.xml
deleted file mode 100644
index c2b0ba09..00000000
--- a/lib/org/hsqldb/hsqldb/maven-metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>org.hsqldb</groupId>
-  <artifactId>hsqldb</artifactId>
-  <versioning>
-    <release>r5836</release>
-    <versions>
-      <version>r5836</version>
-    </versions>
-    <lastUpdated>20180929092113</lastUpdated>
-  </versioning>
-</metadata>
diff --git a/lib/org/hsqldb/hsqldb/maven-metadata.xml.md5 b/lib/org/hsqldb/hsqldb/maven-metadata.xml.md5
deleted file mode 100644
index e54c38b1..00000000
--- a/lib/org/hsqldb/hsqldb/maven-metadata.xml.md5
+++ /dev/null
@@ -1 +0,0 @@
-1d7f55d30c3542b76ef961749da3c40f
\ No newline at end of file
diff --git a/lib/org/hsqldb/hsqldb/maven-metadata.xml.sha1 b/lib/org/hsqldb/hsqldb/maven-metadata.xml.sha1
deleted file mode 100644
index 41a9f454..00000000
--- a/lib/org/hsqldb/hsqldb/maven-metadata.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8bb6a2ace951f1805b9baac61bca3a548e4299cc
\ No newline at end of file
diff --git a/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.jar b/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.jar
deleted file mode 100644
index 72721edf..00000000
Binary files a/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.jar and /dev/null differ
diff --git a/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.jar.md5 b/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.jar.md5
deleted file mode 100644
index 127cbd95..00000000
--- a/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-7d59b5596e655b2e4fd78796e7a3896b
\ No newline at end of file
diff --git a/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.jar.sha1 b/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.jar.sha1
deleted file mode 100644
index 73d9c685..00000000
--- a/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a7d55ed9afd753fd9c620796f7d88f67a554711c
\ No newline at end of file
diff --git a/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.pom b/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.pom
deleted file mode 100644
index ec5069a1..00000000
--- a/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.pom
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.hsqldb</groupId>
-  <artifactId>hsqldb</artifactId>
-  <version>r5836</version>
-</project>
diff --git a/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.pom.md5 b/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.pom.md5
deleted file mode 100644
index 74e8c4f7..00000000
--- a/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-4d667eead4590a45fd75787cd6125701
\ No newline at end of file
diff --git a/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.pom.sha1 b/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.pom.sha1
deleted file mode 100644
index 12b17562..00000000
--- a/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f77180541070ce99899dc281b1c4469a6b9656f0
\ No newline at end of file
diff --git a/osgi-console.sh b/osgi-console.sh
deleted file mode 100755
index adec8b05..00000000
--- a/osgi-console.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-BUNDLES="org.apache.felix.gogo.runtime org.apache.felix.gogo.shell org.apache.felix.gogo.command org.eclipse.equinox.console"
-JAR=org.eclipse.osgi
-PLUGIN_DIR=/usr/local/lib/eclipse/plugins
-
-for bundle in ${BUNDLES}; do
-	bundle_path=`echo ${PLUGIN_DIR}/${bundle}_*.jar`
-
-	if [ -z "${bundles_arg}" ]; then
-		bundles_arg=-Dosgi.bundles=
-	else
-		bundles_arg+=,
-	fi
-
-	bundles_arg+=${bundle_path}@start
-done
-
-java ${bundles_arg} -jar ${PLUGIN_DIR}/${JAR}_*.jar -console