SFX cleanup again