Additions to remove India specific fields