Remove commented code.
Reflect on GCM canonical IDs. Fixes #123.