Fixed analytics again and removed extra stuff