remove -O2
don't carry names across different branches
add TODOs