remove tbd stuff