Update Parsing and Remove Unused Attributes