Drop unnecessary attributes
Update analytics code