Remove unneeded struct; update TODO