Code Cleanup

Change-Id: I0fe44acaf9c7e6c41dcf20f70ad3bb6e5c050aaa