Upgrade to Sf2 and remove unused dependencies