Code Cleanup

Change-Id: Ie43d264824778c92df4d0df216949e5076f01f00