DarkCandy: More Cleanup

Change-Id: I4c94677b93bc4554e0725bad792395b91a9903e9