Cleanup

Change-Id: If5186a3bde0fab238a6dc80fe992a3478236464d