Removed a reference to quantum and removed a dead file

Change-Id: Id1159b1d9f32d6af696159e64321312cdc374276
Merge "Removed a reference to quantum and removed a dead file"