Remove FixMe that is true but irrelevant