Remove remaining references to quantum

Change-Id: If891a065f5d0d8c753f88051093aa3691f0420a2
Merge "Remove remaining references to quantum"