Removed the macros as this is not for debugging