Upgrade to Sf2.3 and remove unused dependencies