Removed macros and implemented permanent logging solution.