Add placeholder for Robot
Remove commented lines