Removed TODO
Updated CHANGELOG
Release 2.5.0