Remove no-longer relevant optimization
0.3.1
Update TODOs