Clean up FD support code