removed missing macros