Remove robot wrapper for simplicity