added analytics-clean-up