Removed unnecessary CPP macro
Add missing NOINLINEs