Refactor PimpleAwareRouter
remove obsolete router