Cleaned up base/router. Removed unnecessary dependencies.