remove commented code
Merge branch 'mbst-8112-schedule-ids' into stage

* mbst-8112-schedule-ids:
  remove commented code