removed CMGTools includes