remove TODO comments for stuff that is done