Prevent pollution of usage data

Fixes #1140