Remove comments after discussion with Rakesh.