Begin work on removing tokens from VCR's