Simplify logic, UFS is not supported here