Merge "Remove redundant robot variable"