cleanups from todo struct changes