Got rid of unused code; it's just commented out for now. Let's see what builtbot spits out.
Got rid of unused code; it's just commented out for now. Let's see what builtbot spits out.

arm-hpc/papi,pyrovski/papi,pyrovski/papi,arm-hpc/papi,pyrovski/papi,arm-hpc/papi,pyrovski/papi,pyrovski/papi,pyrovski/papi,arm-hpc/papi,arm-hpc/papi,arm-hpc/papi,arm-hpc/papi,pyrovski/papi,pyrovski/papi