Code Cleanup

Change-Id: If6d3e5f68ff4238f2f5032f7e53c35c058d2449e