Cleanup files no longer required.
Fix regressions in routes