Clean up ota tools

Change-Id: I2b8274b75971a0b7a87d1bb403ec8d7aecce81d6