Use addWithoutBase for route meant for public
Unused code
Fix validation to match upstream changes