Code Cleanup

Change-Id: Ice82a75659f49404ae309906547cd55ecc43517e