Govt to take control of waterfront for rest of RWC