Merge "Remove unnecessary type and dup for fd"