Fix Routes
Clean up Routes for Track API