more TODO cleanups