Clean-up for UsageController