Remove unused routes, and add spec