Moar cleanup!

Change-Id: I343940119a5f875c80f3aebe2f622cd7ed53c719