upgrading to sf 2.5
removing unneeded
mergin