More routes clean up. Fixes last commit