[PATCH 0/5] sf: Cleanup