Removed unused todo comments