prelim routing engine
router cleanups