Cleanup

Change-Id: Ie332c3f0c365402f3db433fd155ea7c11765af3f