Cleanup

Change-Id: Iee6a715bba41ebbe14bdbc4db24d15c0eebadf9f