Schools challenged to go water-only by 2016