removed unused headers and macros