Cleanup, including sqlite for travis