Removed dependency of FDE