More dustbusing CM leftovers...

Change-Id: I539dc52f74ca60900db2099032f405a4660b1623
Signed-off-by: Noah Greene <chevycam94@gmail.com>