Removed CHECK macros
Sliced macros.h