arc/pm integration cleanups