V6 - Analytics support removal