More cleanup in SqliteDB