removed not required macros