Cleans up routes
Closer to functional state