removed old files; removed do {} while(0) block in macros