remove some dead things, move db to sane place