Removed #define keywords