DarkCandy:2/2

Change-Id: I85417b8d679c26e9c5c0ae12da958802c4d6fd3a
DarkCandy:More CleanUp

Change-Id: Ia248c7776adc51b6c98d1f7752516e9169c03dda