Add FIXME note for later cleanup