removed default value macro defs