Clean up

Change-Id: I250568879d2e90cc4246a324049e6fc47724c26d