Clean up stuff from iicmd that I'm not using