Clean routes and fix badges