Refactor, drop old guzzle, drop php-vcr