convert to current express
tidy up all the routes