cleanup dependence on serve-static