Cleanup and merger of sqlite files

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #1851 from Oldiesmann/release-2.1

Cleanup and merger of sqlite files