This then eliminates the misguided attempts at merging f2/4 and f3 flash support. Some headers remain.