Removed unused code and refactored route service.