- drop conditional macros for now