cleanup of contextualized routes
Merge pull request #1213 from drewfish/rnc

cleanup of contextualized routes