remove other defines as recommended by @jacobrosenthal