Remove unscoped IDs

Fixes #15