Removing SQLite dependency