Removed obsolete FIXME