Tie curated ENUMs to metrics

Also remove stray file