Some TODOs removed