Remove unnecessary macro compat code