Now that the target macros are not being used, we remove them. This prevents target hardcoding regressions.