Minister tells WAPCo to deliver on April 30 deadline