Pulling in some changes to remove code debuging.