Cleaned up the Sqlite, FileStore, and most of the Glacier store