Rework network and clean