Remove TODO
Cleanup
Cleanup
Fix TODO
Add assertions