removing binaryop/unaryop macros