[MP] Remove unused flag models that were left-over q3 cruft.
[MP] A few more cleanups reported from cppcheck.
Merge branch 'master' into rend2