Cleanup

This removes some of the `XXX` comments I had added.