Code cleanup

Change-Id: Ie314010a650f66d47255a70903d45aff2444d9b8