Removed some #define s