Cleanup and sync

Change-Id: I32075d459ecd823691ed8f4aa40e1ff02d675918