Remove hsqldb dependency