CODE: Remove vestiges of deprecated code displaced by the passenger generation system