Hystrix: 3rd party cleanup