more TODO cleanup