Selangor Menteri Besar Abdul Khalid Ibrahim today finalised the state's water restructuring deal with Putrajaya, staving off attempts to abort the plan by any incoming Pakatan Rakyat leader who will be succeeding him.