Code Cleanup

Change-Id: I58d180c23ce81d5badd8cc573c4cb8aeb923db93