Taking out analytics and other stuff