Code Cleanup

Change-Id: I1001fdae628cb605470e4e950d3f17cec77c0d1a