more TODO updates and cleanup