COLLECTION: Cleaning FIXME comments
I scanned through the code and made sure that the FIXME
comments are either addressed or a corresponding ticket exists.
I removed two comments that had "FIXME" in them.
The tickets for those comments are #72 and #308.