Removed hack from robot model utils