remove returned m2t struct where not needed

* add FIXME tag to `addIfNotDefault` since the function is used nowhere
* `cdata2colorindex` is not modified as per discussion in #477