analytics cleanup