Sync up all the topologies.

Also removed ESnet Singaren connection