Make the API consistent with VCR
Remove old unnecessary code