Cleanup plugins now we use fd_common.h