Fix route models and clean routes file