clean up, fix bug in finding db names file, and remove/modify messages