Clean-up changes not related to Quantum