Removing SQLite stuff and unused references