Cleaning some leftovers
New routes for new class names