Removed TODO and updated Changelog