File clean up, add analytics