Redundant null id null checks

[marschall]

After integrating #1870 various null checks for ids became redundant.

[fmbenhassine]

Thank you for raising this and contributing a PR! This is one of the benefits of #1870.