Code Cleanup

Change-Id: I066c5a13017187d2effb8688013b8fa9085698b2