Update to the new Prime Mover m2e integration.  Clean up.