The Trump administration has closed a controversial program that used undercover US air marshals on flights to surveil passengers, and removed a government official who took responsibility for putting Director of National Intelligence Tulsi Gabbard in it.