Cleanups for metering