Remove completed TODO
Migrate TODO note to correct location