remove use of cetbuildtools macros where possible