Rmeove the passenger class dependency