[NA] Commenting out some not used items.