Cleanup list of robots

Change-Id: Ie08e89f679094ab841b220a2375a0d6aac6866dc