removed TRUE/FALSE macros