sf: sst: Fix code cleanup