remove flux dependency, remove un-needed condition