remove the TODOs, they are not critical for RC1