[MOD] delete FIXME and TODO comments - part 2