following Matt Hastie recommendation for removing run-time macros