Upgrade Sf2.4
Clean ups and add validation mapping
remove deprecated method