Remove last parts of Quantum compatibility shim

Goodbye Quantum!

Change-Id: Idbd0384a892beaff3a937444f04cfc433cb805eb
Closes-Bug:1299046
Merge "Remove last parts of Quantum compatibility shim"