Cleanup unused use statements

Change-Id: If34b44bb787f68f54e1090b952cc39a58eb0066e