Remove bundle from token and add in usage monitoring.