completed shifting to sqlite
clean up
cleanup