Cleanup on master branch

Change-Id: I4f4cd7e09abf15bf2b539f4d8625bc32cb4eafad