[US21.2] Add some #ifndef macros and remove debug messages