Citric acid passivation offers attractive environmental advantages, soaps having success with mineral acid passivation and suffering no safety issues might want to stay the course. Also no disposal problems.