more unrelated changes removed from this branch