Some Cleanup

Change-Id: I61ae19bc0fb8ec44674574d6aec6a0559c233638