Revert "Revert "Revert "removed qc-specific stuff, putting in qc branch"""

This reverts commit 8b36fd1af9cc7575f079cc448f4ec490c5fb9a55.