Update: moved todo back to top
Remove: legacy file