Merge "refactor(ufs): delete unused variables" into integration