Remove more dangling references for UFS support

This is the result of a grep effort so hopefully we are completely done.

Bye UFS, you were long overdue for removal!