Code Cleanup

Change-Id: I90f46f3e672434f7002d72a313b60bacd680c63b