EC2 fixes.  Add useContactPointsOnly
Remove Junk