clean up some lingering XXX comments
Merge remote-tracking branch 'origin'