minor db changes, remove swap files