remove pointless #defines