DNM: Test removing ffs