Cleaned up Uber integration.