Removed TODO's that are no longer needed