Cleaning index and adding new analytics code