remove the use of cetbuildtools macros as much as possible