#139 Removed obsolete TODO