removed unneeded attributes in Data