removed duplicate ~~COMPLEX_TABLES~~ macros