Tidyup, remove some outdated todos