-revert RouteFilter
-refactor stuff