Get rid of broken preflight implementation