cleaned up routes