Removed TBD changes from other branch.