remove unnecessary redefines from previous commit