Remove other devices

Change-Id: Ie4711e80105b61ef17892be94fc1592fde6ce999