Don't want to merge these TODOs - can we just remove them.