more cleanup, most routes work with new db now