Removing todo message, as the work is complete.
Merge branch 'modularisation'

* modularisation:
  Removing todo message, as the work is complete.