General fixes
Add clean up sqlite file