First go at removing Run2 specific code

3 jobs for sponce_removeRun2Code in 32 seconds