Cleanup!

Change-Id: I423b151d9e33f3ff741d6fd98be0fb6adb87e4a6