Revert "Add addId option"

This reverts commit 327a35653149eedd3ab6afffd3f20218a87240b7.