Move tombstone creation to RobotPlanet