Remove Sqlite3 dependency