"Enhanced" Analytics and remove header file.