remove ARO related stuff until we define a stable API