Remove remote if it is not consistent with METADATA am: a08fb60ea4

Change-Id: Ibb38b4766e6add9f02d1f1925182040be0688481