cleanup after Steve's cleanup and the merge of 1.8 branch