Remove some ? stuff
Fix my incomplete merge from master