Remove refs to  in normalize
Bump versions