Skip to content

Cleanup macros

Cleanup macros #5565