Refactor analytics and remove `addThis`