Commented out VCR stuff for now