[DF-185] Removed deprecated macro from *.cpp