Finish using new libsfp API