wip removing as much as possible from platform_macro files
wip continuing to remove from platform macro files