Remove TODO: Not badcode now.