Removed more TODO notes