Code Cleanup

Change-Id: I4fa55cb0894f3b3a54111cbe33644b8c43de5b53