Removed unused attributes