Update GetOptNet + SQLite
More code cleanup