Flux 27.1 clean-up