Remove category.name

- And at the same time a lot of rideshare code