Clean-up counter

Clean-up counter