tncc related changes
tncc cleanup