DDF-321 - removed old comments