Updated to use new RouteEffectType, and removed some old unwanted enums