Some TODOs Removed