Clean up PME domain count passing