More Clean-Up

Change-Id: I60eb857784a8fc565067484983424adef16b53a8