Remove unused passport stuff