Removed TODO
Removed done todo [ci skip]