Fix route ambiguity and remove unused routes/controller