Removed TODO items that are no longer relevant