Minor refactorings after Katrina meeting. Commented out all VCR stuff.