Code Cleanup

Change-Id: Ic473181b2dc93298d8b80e94b8fdd8f437c738bc