MMAMASHIA: The Water Utilities Corporation (WUC) has assured Greater Gaborone residents that water shortages will be the thing of the past by June, thanks to the P1.1 billion Mmamashia Water Treatment Expansion Project, set to be commissioned alongside the North-South Carrier II.