Removed TODO now maintain that in the wiki and issues