remove unnecessary redefines from previous commit
Merge branch 'szo4' into sezero