removed macros to enable functions that were not needed previously