usr, more cleanup and bug fix in httprouter