New Welsh Health Bill drops vaping provisions