Removed legacy todo message