pre-big cleanup, merging plugins to support AR libraries that do not distinguish the two