Remove analytics properly