Merge "Remove most of FDE support"