Added in parameter to remove Element Type and Name