Revert "Add StrDff back"

This reverts commit d2cc4f9cec2d11dda221f7e90aa5cce41eb9e17d.