Renamed start_swap to remove and a few adjustments to sqlite