removed obsolete routes and fixed a few tests