Clean up in Communication. Removed the unused ESRI references.