Cleaning up dead code, harmonizing with other experiments