Removed deug traces before trunk merge.