Remove dead code, move routing to base module
More cleanup