Fixed comment
Removed obsolete todos