DarkCandy:Cleanup

Change-Id: If6fce41a416e00b93957e7f4e3c2dd15a0bfc55d