[HB] Remove more macros
drwxr-xr-x - src