City plans rehab of waterways