remove XXX comments for things that have been dealt with. Issue #30.