Code Cleanup

Change-Id: Ieb27c0cad89ba8f45a44ed14ecac07a410bd3c72