Removed redundant TODOs