remove useless define
small fixes