Clean up trivial function and duplicating macroses from NBNXM