remove fves and remove dfs case