Added some TODOs to remove debug info