fixing project file and removing more references to CLToolkit macros