Code Cleanup

Change-Id: Iaecd364db870c922233e60826f0ec4a6af739358