Removed unnecessary attributes