Remove some of the #define's I inherited from the olden days, I don't rely
on any of their features...