Deleted robot-specific classesa nd added TODOs