remove TODO that is done.