Clean up

*Technical changes related to this issue:*
- remove done todo