removed analytics when not needed