Code Cleanup

Change-Id: I058176d30e9842b8c66f8a76f05d1de9f8216020